diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-01-11 10:26:48 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-01-11 10:26:48 (GMT) |
commit | 9e5947465d72ef1b3a88104474ab2adf78837220 (patch) | |
tree | 2e71fa8e496b8e047e5a90e81b685ed1f8d3ed7f /sound/pci/atiixp.c | |
parent | 624afe4dc9a08992b200046dfe8a61f19bab74ab (diff) | |
parent | 3e41c9b5a1ca2acfd9306a918fe3903f02eb89ca (diff) | |
download | linux-9e5947465d72ef1b3a88104474ab2adf78837220.tar.xz |
Merge branch 'topic/pci-cleanup' into for-next
Diffstat (limited to 'sound/pci/atiixp.c')
-rw-r--r-- | sound/pci/atiixp.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c index d24188f..eb4f9ee 100644 --- a/sound/pci/atiixp.c +++ b/sound/pci/atiixp.c @@ -1474,7 +1474,6 @@ static int snd_atiixp_mixer_new(struct atiixp *chip, int clock, */ static int snd_atiixp_suspend(struct device *dev) { - struct pci_dev *pci = to_pci_dev(dev); struct snd_card *card = dev_get_drvdata(dev); struct atiixp *chip = card->private_data; int i; @@ -1492,29 +1491,15 @@ static int snd_atiixp_suspend(struct device *dev) snd_ac97_suspend(chip->ac97[i]); snd_atiixp_aclink_down(chip); snd_atiixp_chip_stop(chip); - - pci_disable_device(pci); - pci_save_state(pci); - pci_set_power_state(pci, PCI_D3hot); return 0; } static int snd_atiixp_resume(struct device *dev) { - struct pci_dev *pci = to_pci_dev(dev); struct snd_card *card = dev_get_drvdata(dev); struct atiixp *chip = card->private_data; 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); - snd_atiixp_aclink_reset(chip); snd_atiixp_chip_start(chip); |