ALSA: cs5535audio: update PCI device handling in suspend/resume
Subsystems (2)
PATCH 3/5 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 <[email protected]>
---
sound/pci/cs5535audio/cs5535audio_pm.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-)
sound/pci/cs5535audio/cs5535audio_pm.c +10 -2
@@ -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" );
Quoted 4 lines · Andres Salomon
Save the PCI state before disabling the device, and add some error checking.
Signed-off-by Andres Salomon <[email protected]>
Acked-by Jordan Crouse <[email protected]>
Quoted 38 lines
---
sound/pci/cs5535audio/cs5535audio_pm.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-)sound/pci/cs5535audio/cs5535audio_pm.c +10
-2@@ -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" );
Signature · 3 lines
Jordan Crouse Systems Software Development Engineer Advanced Micro Devices, Inc.