diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-01-11 11:26:48 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-11 11:26:48 +0100 |
| commit | 9e5947465d72ef1b3a88104474ab2adf78837220 (patch) | |
| tree | 2e71fa8e496b8e047e5a90e81b685ed1f8d3ed7f /sound/pci/ens1370.c | |
| parent | 624afe4dc9a08992b200046dfe8a61f19bab74ab (diff) | |
| parent | 3e41c9b5a1ca2acfd9306a918fe3903f02eb89ca (diff) | |
Merge branch 'topic/pci-cleanup' into for-next
Diffstat (limited to 'sound/pci/ens1370.c')
| -rw-r--r-- | sound/pci/ens1370.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c index bb1f4d22df5f..219b8af29a49 100644 --- a/sound/pci/ens1370.c +++ b/sound/pci/ens1370.c @@ -2033,7 +2033,6 @@ static void snd_ensoniq_chip_init(struct ensoniq *ensoniq) #ifdef CONFIG_PM_SLEEP static int snd_ensoniq_suspend(struct device *dev) { - struct pci_dev *pci = to_pci_dev(dev); struct snd_card *card = dev_get_drvdata(dev); struct ensoniq *ensoniq = card->private_data; @@ -2054,28 +2053,14 @@ static int snd_ensoniq_suspend(struct device *dev) udelay(100); snd_ak4531_suspend(ensoniq->u.es1370.ak4531); #endif - - pci_disable_device(pci); - pci_save_state(pci); - pci_set_power_state(pci, PCI_D3hot); return 0; } static int snd_ensoniq_resume(struct device *dev) { - struct pci_dev *pci = to_pci_dev(dev); struct snd_card *card = dev_get_drvdata(dev); struct ensoniq *ensoniq = card->private_data; - 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); - snd_ensoniq_chip_init(ensoniq); #ifdef CHIP1371 |