lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ALSA] cs5535audio: update PCI device handling in suspend/resume

Browse Source 
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>
This commit is contained in:
Andres Salomon
2007-09-03 15:42:52 +02:00
committed by Jaroslav Kysela
parent 222fa0b0d2
commit 1caae3682e
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sound/pci/cs5535audio/cs5535audio_pm.c
View File

@@ -74,8 +74,11 @@ int snd_cs5535audio_suspend(struct pci_dev *pci, pm_message_t state)
/* save important regs, then disable aclink in hw */ /* save important regs, then disable aclink in hw */
snd_cs5535audio_stop_hardware(cs5535au); 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_disable_device(pci);
pci_save_state(pci);
pci_set_power_state(pci, pci_choose_state(pci, state)); pci_set_power_state(pci, pci_choose_state(pci, state));
return 0; return 0;
} }
@@ -89,7 +92,12 @@ int snd_cs5535audio_resume(struct pci_dev *pci)
int i; int i;
pci_set_power_state(pci, PCI_D0); 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) { if (pci_enable_device(pci) < 0) {
printk(KERN_ERR "cs5535audio: pci_enable_device failed, " printk(KERN_ERR "cs5535audio: pci_enable_device failed, "
"disabling device\n"); "disabling device\n");