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/riptide | |
parent | ALSA: hda - fixup input_free_device called after input_unregister_device (diff) | |
parent | ALSA: ymfpci: Simplify PM callbacks (diff) | |
download | linux-9e5947465d72ef1b3a88104474ab2adf78837220.tar.xz linux-9e5947465d72ef1b3a88104474ab2adf78837220.zip |
Merge branch 'topic/pci-cleanup' into for-next
Diffstat (limited to 'sound/pci/riptide')
-rw-r--r-- | sound/pci/riptide/riptide.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index 121f2c09d7a7..a1521047e619 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c @@ -1153,7 +1153,6 @@ static void riptide_handleirq(unsigned long dev_id) #ifdef CONFIG_PM_SLEEP static int riptide_suspend(struct device *dev) { - struct pci_dev *pci = to_pci_dev(dev); struct snd_card *card = dev_get_drvdata(dev); struct snd_riptide *chip = card->private_data; @@ -1161,27 +1160,14 @@ static int riptide_suspend(struct device *dev) snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); snd_pcm_suspend_all(chip->pcm); snd_ac97_suspend(chip->ac97); - pci_disable_device(pci); - pci_save_state(pci); - pci_set_power_state(pci, PCI_D3hot); return 0; } static int riptide_resume(struct device *dev) { - struct pci_dev *pci = to_pci_dev(dev); struct snd_card *card = dev_get_drvdata(dev); struct snd_riptide *chip = card->private_data; - pci_set_power_state(pci, PCI_D0); - pci_restore_state(pci); - if (pci_enable_device(pci) < 0) { - printk(KERN_ERR "riptide: pci_enable_device failed, " - "disabling device\n"); - snd_card_disconnect(card); - return -EIO; - } - pci_set_master(pci); snd_riptide_initialize(chip); snd_ac97_resume(chip->ac97); snd_power_change_state(card, SNDRV_CTL_POWER_D0); |