diff options
| author | Takashi Iwai <tiwai@suse.de> | 2006-10-11 18:52:53 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-10-22 10:51:10 +0200 |
| commit | 30b35399ceb2398d05837863476dcb12f12f3a82 (patch) | |
| tree | 14a7cfad1c5d28d207bb1be8addb86ead33f7b63 /sound/pci/fm801.c | |
| parent | c06134d73cdc02bb8ab1fad180f6da1f28d2e049 (diff) | |
| download | linux-30b35399ceb2398d05837863476dcb12f12f3a82.tar.gz linux-30b35399ceb2398d05837863476dcb12f12f3a82.tar.bz2 linux-30b35399ceb2398d05837863476dcb12f12f3a82.zip | |
[ALSA] Various fixes for suspend/resume of ALSA PCI drivers
- Check the return value of pci_enable_device() and request_irq()
in the suspend. If any error occurs there, disable the device
using snd_card_disconnect().
- Call pci_set_power_state() properly with pci_choose_state().
- Fix the order to call pci_set_power_state().
- Removed obsolete house-made PM codes in some drivers.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/fm801.c')
| -rw-r--r-- | sound/pci/fm801.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c index 3ec7d7ee04dd..77e3d5c18302 100644 --- a/sound/pci/fm801.c +++ b/sound/pci/fm801.c @@ -1531,9 +1531,9 @@ static int snd_fm801_suspend(struct pci_dev *pci, pm_message_t state) chip->saved_regs[i] = inw(chip->port + saved_regs[i]); /* FIXME: tea575x suspend */ - pci_set_power_state(pci, PCI_D3hot); pci_disable_device(pci); pci_save_state(pci); + pci_set_power_state(pci, pci_choose_state(pci, state)); return 0; } @@ -1543,9 +1543,14 @@ static int snd_fm801_resume(struct pci_dev *pci) struct fm801 *chip = card->private_data; int i; - pci_restore_state(pci); - pci_enable_device(pci); pci_set_power_state(pci, PCI_D0); + pci_restore_state(pci); + if (pci_enable_device(pci) < 0) { + printk(KERN_ERR "fm801: pci_enable_device failed, " + "disabling device\n"); + snd_card_disconnect(card); + return -EIO; + } pci_set_master(pci); snd_fm801_chip_init(chip, 1); |