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/fm801.c | |
| 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/fm801.c')
| -rw-r--r-- | sound/pci/fm801.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c index 46ac399d2f88..52555bdaf91c 100644 --- a/sound/pci/fm801.c +++ b/sound/pci/fm801.c @@ -1367,7 +1367,6 @@ static unsigned char saved_regs[] = { static int snd_fm801_suspend(struct device *dev) { - struct pci_dev *pci = to_pci_dev(dev); struct snd_card *card = dev_get_drvdata(dev); struct fm801 *chip = card->private_data; int i; @@ -1379,29 +1378,15 @@ static int snd_fm801_suspend(struct device *dev) for (i = 0; i < ARRAY_SIZE(saved_regs); i++) chip->saved_regs[i] = inw(chip->port + saved_regs[i]); /* FIXME: tea575x suspend */ - - pci_disable_device(pci); - pci_save_state(pci); - pci_set_power_state(pci, PCI_D3hot); return 0; } static int snd_fm801_resume(struct device *dev) { - struct pci_dev *pci = to_pci_dev(dev); struct snd_card *card = dev_get_drvdata(dev); struct fm801 *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_fm801_chip_init(chip, 1); snd_ac97_resume(chip->ac97); snd_ac97_resume(chip->ac97_sec); |