1 files changed, 8 insertions, 5 deletions

diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 05605f474a72..8cab342bbaaf 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -2589,12 +2589,9 @@ static int m3_suspend(struct pci_dev *pci, pm_message_t state)
                 chip->suspend_mem[index++] = 
                         snd_m3_assp_read(chip, MEMTYPE_INTERNAL_DATA, i);
 
-        /* power down apci registers */
-        snd_m3_outw(chip, 0xffff, 0x54);
-        snd_m3_outw(chip, 0xffff, 0x56);
-
         pci_disable_device(pci);
         pci_save_state(pci);
+        pci_set_power_state(pci, pci_choose_state(pci, state));
         return 0;
 }
 
@@ -2607,8 +2604,14 @@ static int m3_resume(struct pci_dev *pci)
         if (chip->suspend_mem == NULL)
                 return 0;
 
+        pci_set_power_state(pci, PCI_D0);
         pci_restore_state(pci);
-        pci_enable_device(pci);
+        if (pci_enable_device(pci) < 0) {
+                printk(KERN_ERR "maestor3: pci_enable_device failed, "
+                       "disabling device\n");
+                snd_card_disconnect(card);
+                return -EIO;
+        }
         pci_set_master(pci);
 
         /* first lets just bring everything back. .*/