Merge ../scsi-rc-fixes-2.6

1 files changed, 8 insertions, 3 deletions

diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c
index 15fc3929b5f7..8fb55d3b454b 100644
--- a/sound/pci/als4000.c
+++ b/sound/pci/als4000.c
@@ -804,9 +804,9 @@ static int snd_als4000_suspend(struct pci_dev *pci, pm_message_t state)
         snd_pcm_suspend_all(chip->pcm);
         snd_sbmixer_suspend(chip);
 
-        pci_set_power_state(pci, PCI_D3hot);
         pci_disable_device(pci);
         pci_save_state(pci);
+        pci_set_power_state(pci, pci_choose_state(pci, state));
         return 0;
 }
 
@@ -816,9 +816,14 @@ static int snd_als4000_resume(struct pci_dev *pci)
         struct snd_card_als4000 *acard = card->private_data;
         struct snd_sb *chip = acard->chip;
 
-        pci_restore_state(pci);
-        pci_enable_device(pci);
         pci_set_power_state(pci, PCI_D0);
+        pci_restore_state(pci);
+        if (pci_enable_device(pci) < 0) {
+                printk(KERN_ERR "als4000: pci_enable_device failed, "
+                       "disabling device\n");
+                snd_card_disconnect(card);
+                return -EIO;
+        }
         pci_set_master(pci);
 
         snd_als4000_configure(chip);