Changeset 70 for GPL/trunk/alsa-kernel/pci/maestro3.c

Timestamp:

Jan 14, 2006, 6:38:48 PM (20 years ago)

Author:

vladest

Message:

Ensonic/Maestro3/VIA/ATI power management fixes
Intel ICH SI7012 fixes

File:

• GPL/trunk/alsa-kernel/pci/maestro3.c (modified) (6 diffs)

GPL/trunk/alsa-kernel/pci/maestro3.c

@@ -2610 +2610 @@
         return 0;
 
+    snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
     snd_pcm_suspend_all(chip->pcm);
     snd_ac97_suspend(chip->ac97);
@@ -2629 +2630 @@
     snd_m3_outw(chip, 0xffff, 0x54);
     snd_m3_outw(chip, 0xffff, 0x56);
+    pci_disable_device(chip->pci);
+    pci_save_state(chip->pci);
     return 0;
 }
@@ -2640 +2643 @@
         return 0;
 
+    pci_restore_state(chip->pci);
+    pci_enable_device(chip->pci);
     pci_set_master(chip->pci);
 
@@ -2670 +2675 @@
     snd_m3_amp_enable(chip, 1);
 
+    snd_power_change_state(card, SNDRV_CTL_POWER_D0);
     return 0;
 }
@@ -2822 +2828 @@
     if (chip->suspend_mem == NULL)
         snd_printk("can't allocate apm buffer\n");
-    else
-        snd_card_set_pm_callback(card, m3_suspend, m3_resume, chip);
 #endif
 
@@ -2933 +2937 @@
 
 static struct pci_driver driver = {
-    0,0,0, "Maestro3",
-    snd_m3_ids,
-    snd_m3_probe,
-    snd_m3_remove,
-    SND_PCI_PM_CALLBACKS
+        .name = "Maestro3",
+        .id_table = snd_m3_ids,
+        .probe = snd_m3_probe,
+        .remove = __devexit_p(snd_m3_remove),
+#ifdef CONFIG_PM
+        .suspend = m3_suspend,
+        .resume = m3_resume,
+#endif
 };