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/ice1712/ice1712.c | |
| parent | ALSA: hda - fixup input_free_device called after input_unregister_device (diff) | |
| parent | ALSA: ymfpci: Simplify PM callbacks (diff) | |
| download | linux-dev-9e5947465d72ef1b3a88104474ab2adf78837220.tar.xz linux-dev-9e5947465d72ef1b3a88104474ab2adf78837220.zip | |
Merge branch 'topic/pci-cleanup' into for-next
Diffstat (limited to 'sound/pci/ice1712/ice1712.c')
| -rw-r--r-- | sound/pci/ice1712/ice1712.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index a2ee29826d0d..f7b1523e8a82 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c @@ -2784,7 +2784,6 @@ static void snd_ice1712_remove(struct pci_dev *pci) #ifdef CONFIG_PM_SLEEP static int snd_ice1712_suspend(struct device *dev) { - struct pci_dev *pci = to_pci_dev(dev); struct snd_card *card = dev_get_drvdata(dev); struct snd_ice1712 *ice = card->private_data; @@ -2806,16 +2805,11 @@ static int snd_ice1712_suspend(struct device *dev) if (ice->pm_suspend) ice->pm_suspend(ice); - - pci_disable_device(pci); - pci_save_state(pci); - pci_set_power_state(pci, PCI_D3hot); return 0; } static int snd_ice1712_resume(struct device *dev) { - struct pci_dev *pci = to_pci_dev(dev); struct snd_card *card = dev_get_drvdata(dev); struct snd_ice1712 *ice = card->private_data; int rate; @@ -2823,16 +2817,6 @@ static int snd_ice1712_resume(struct device *dev) if (!ice->pm_suspend_enabled) return 0; - pci_set_power_state(pci, PCI_D0); - pci_restore_state(pci); - - if (pci_enable_device(pci) < 0) { - snd_card_disconnect(card); - return -EIO; - } - - pci_set_master(pci); - if (ice->cur_rate) rate = ice->cur_rate; else |