* [PATCH 3/5] ALSA: cs5535audio: update PCI device handling in suspend/resume
@ 2007-08-30 3:30 Andres Salomon
2007-08-30 14:44 ` Jordan Crouse
0 siblings, 1 reply; 2+ messages in thread
From: Andres Salomon @ 2007-08-30 3:30 UTC (permalink / raw)
To: jayakumar.alsa; +Cc: akpm, jordan.crouse, linux-kernel, info-linux
Save the PCI state before disabling the device, and add some error checking.
Signed-off-by: Andres Salomon <dilinger@debian.org>
---
sound/pci/cs5535audio/cs5535audio_pm.c | 12 ++++++++++--
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");
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: ALSA: cs5535audio: update PCI device handling in suspend/resume
2007-08-30 3:30 [PATCH 3/5] ALSA: cs5535audio: update PCI device handling in suspend/resume Andres Salomon
@ 2007-08-30 14:44 ` Jordan Crouse
0 siblings, 0 replies; 2+ messages in thread
From: Jordan Crouse @ 2007-08-30 14:44 UTC (permalink / raw)
To: Andres Salomon; +Cc: jayakumar.alsa, akpm, linux-kernel, info-linux
On 29/08/07 23:30 -0400, Andres Salomon wrote:
>
> Save the PCI state before disabling the device, and add some error checking.
>
> Signed-off-by: Andres Salomon <dilinger@debian.org>
Acked-by: Jordan Crouse <jordan.crouse@amd.com>
> ---
>
> sound/pci/cs5535audio/cs5535audio_pm.c | 12 ++++++++++--
> 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");
>
>
--
Jordan Crouse
Systems Software Development Engineer
Advanced Micro Devices, Inc.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-08-30 14:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-30 3:30 [PATCH 3/5] ALSA: cs5535audio: update PCI device handling in suspend/resume Andres Salomon
2007-08-30 14:44 ` Jordan Crouse
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox