|
@@ -3347,7 +3347,6 @@ static unsigned char saved_mixers[] = {
|
|
|
|
|
|
static int snd_cmipci_suspend(struct device *dev)
|
|
static int snd_cmipci_suspend(struct device *dev)
|
|
{
|
|
{
|
|
- struct pci_dev *pci = to_pci_dev(dev);
|
|
|
|
struct snd_card *card = dev_get_drvdata(dev);
|
|
struct snd_card *card = dev_get_drvdata(dev);
|
|
struct cmipci *cm = card->private_data;
|
|
struct cmipci *cm = card->private_data;
|
|
int i;
|
|
int i;
|
|
@@ -3366,29 +3365,15 @@ static int snd_cmipci_suspend(struct device *dev)
|
|
|
|
|
|
/* disable ints */
|
|
/* disable ints */
|
|
snd_cmipci_write(cm, CM_REG_INT_HLDCLR, 0);
|
|
snd_cmipci_write(cm, CM_REG_INT_HLDCLR, 0);
|
|
-
|
|
|
|
- pci_disable_device(pci);
|
|
|
|
- pci_save_state(pci);
|
|
|
|
- pci_set_power_state(pci, PCI_D3hot);
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
static int snd_cmipci_resume(struct device *dev)
|
|
static int snd_cmipci_resume(struct device *dev)
|
|
{
|
|
{
|
|
- struct pci_dev *pci = to_pci_dev(dev);
|
|
|
|
struct snd_card *card = dev_get_drvdata(dev);
|
|
struct snd_card *card = dev_get_drvdata(dev);
|
|
struct cmipci *cm = card->private_data;
|
|
struct cmipci *cm = card->private_data;
|
|
int i;
|
|
int i;
|
|
|
|
|
|
- pci_set_power_state(pci, PCI_D0);
|
|
|
|
- pci_restore_state(pci);
|
|
|
|
- if (pci_enable_device(pci) < 0) {
|
|
|
|
- dev_err(dev, "pci_enable_device failed, disabling device\n");
|
|
|
|
- snd_card_disconnect(card);
|
|
|
|
- return -EIO;
|
|
|
|
- }
|
|
|
|
- pci_set_master(pci);
|
|
|
|
-
|
|
|
|
/* reset / initialize to a sane state */
|
|
/* reset / initialize to a sane state */
|
|
snd_cmipci_write(cm, CM_REG_INT_HLDCLR, 0);
|
|
snd_cmipci_write(cm, CM_REG_INT_HLDCLR, 0);
|
|
snd_cmipci_ch_reset(cm, CM_CH_PLAY);
|
|
snd_cmipci_ch_reset(cm, CM_CH_PLAY);
|