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/ymfpci | |
| parent | 624afe4dc9a08992b200046dfe8a61f19bab74ab (diff) | |
| parent | 3e41c9b5a1ca2acfd9306a918fe3903f02eb89ca (diff) | |
| download | linux-9e5947465d72ef1b3a88104474ab2adf78837220.tar.bz2 | |
Merge branch 'topic/pci-cleanup' into for-next
Diffstat (limited to 'sound/pci/ymfpci')
| -rw-r--r-- | sound/pci/ymfpci/ymfpci_main.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c index de7f06fb3f92..227d5c9dfe09 100644 --- a/sound/pci/ymfpci/ymfpci_main.c +++ b/sound/pci/ymfpci/ymfpci_main.c @@ -2299,7 +2299,6 @@ static int saved_regs_index[] = { static int snd_ymfpci_suspend(struct device *dev) { - struct pci_dev *pci = to_pci_dev(dev); struct snd_card *card = dev_get_drvdata(dev); struct snd_ymfpci *chip = card->private_data; unsigned int i; @@ -2320,9 +2319,6 @@ static int snd_ymfpci_suspend(struct device *dev) snd_ymfpci_writel(chip, YDSXGR_NATIVEDACOUTVOL, 0); snd_ymfpci_writel(chip, YDSXGR_BUF441OUTVOL, 0); snd_ymfpci_disable_dsp(chip); - pci_disable_device(pci); - pci_save_state(pci); - pci_set_power_state(pci, PCI_D3hot); return 0; } @@ -2333,14 +2329,6 @@ static int snd_ymfpci_resume(struct device *dev) struct snd_ymfpci *chip = card->private_data; unsigned 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_ymfpci_aclink_reset(pci); snd_ymfpci_codec_ready(chip, 0); snd_ymfpci_download_image(chip); |