Merge branch 'drm-edid-fixes' into drm-core-next

[pandora-kernel.git] / sound / pci / cs5535audio / cs5535audio_pm.c

diff --git a/sound/pci/cs5535audio/cs5535audio_pm.c b/sound/pci/cs5535audio/cs5535audio_pm.c
index 9a4e84a..a3301cc 100644 (file)
--- a/sound/pci/cs5535audio/cs5535audio_pm.c
+++ b/sound/pci/cs5535audio/cs5535audio_pm.c
@@ -19,10 +19,8 @@
  */
 
 #include <linux/init.h>
-#include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
-#include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/control.h>
 #include <sound/initval.h>
@@ -74,8 +72,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 +90,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");