summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@debian.org>2007-09-03 15:42:52 +0200
committerJaroslav Kysela <perex@perex.cz>2007-10-16 15:59:53 +0200
commit1caae3682e2a712b64ce682702ed56bb3dc9f435 (patch)
treefa2d7a04f358f59e2869df8689edfa464e8cf75c /sound
parent222fa0b0d2fdb2373a71d532c2cabd2ec920b3b3 (diff)
downloadop-kernel-dev-1caae3682e2a712b64ce682702ed56bb3dc9f435.zip
op-kernel-dev-1caae3682e2a712b64ce682702ed56bb3dc9f435.tar.gz
[ALSA] cs5535audio: update PCI device handling in suspend/resume
Save the PCI state before disabling the device, and add some error checking. Signed-off-by: Andres Salomon <dilinger@debian.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/cs5535audio/cs5535audio_pm.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/sound/pci/cs5535audio/cs5535audio_pm.c b/sound/pci/cs5535audio/cs5535audio_pm.c
index 9a4e84a..838708f 100644
--- a/sound/pci/cs5535audio/cs5535audio_pm.c
+++ b/sound/pci/cs5535audio/cs5535audio_pm.c
@@ -74,8 +74,11 @@ int snd_cs5535audio_suspend(struct pci_dev *pci, pm_message_t state)
/* save important regs, then disable aclink in hw */
snd_cs5535audio_stop_hardware(cs5535au);
+ if (pci_save_state(pci)) {
+ printk(KERN_ERR "cs5535audio: pci_save_state failed!\n");
+ return -EIO;
+ }
pci_disable_device(pci);
- pci_save_state(pci);
pci_set_power_state(pci, pci_choose_state(pci, state));
return 0;
}
@@ -89,7 +92,12 @@ int snd_cs5535audio_resume(struct pci_dev *pci)
int i;
pci_set_power_state(pci, PCI_D0);
- pci_restore_state(pci);
+ if (pci_restore_state(pci) < 0) {
+ printk(KERN_ERR "cs5535audio: pci_restore_state failed, "
+ "disabling device\n");
+ snd_card_disconnect(card);
+ return -EIO;
+ }
if (pci_enable_device(pci) < 0) {
printk(KERN_ERR "cs5535audio: pci_enable_device failed, "
"disabling device\n");
OpenPOWER on IntegriCloud