patch-2.4.6 linux/drivers/sound/maestro3.c

• Lines: 46
• Date: Wed Jun 27 13:15:17 2001
• Orig file: v2.4.5/linux/drivers/sound/maestro3.c
• Orig date: Sat Apr 21 10:36:30 2001

diff -u --recursive --new-file v2.4.5/linux/drivers/sound/maestro3.c linux/drivers/sound/maestro3.c
@@ -371,7 +371,7 @@
  * I'm not very good at laying out functions in a file :)
  */
 static int m3_notifier(struct notifier_block *nb, unsigned long event, void *buf);
-static void m3_suspend(struct pci_dev *pci_dev);
+static int m3_suspend(struct pci_dev *pci_dev, u32 state);
 static void check_suspend(struct m3_card *card);
 
 struct notifier_block m3_reboot_nb = {m3_notifier, NULL, 0};
@@ -2771,12 +2771,12 @@
 
     for(card = devs; card != NULL; card = card->next) {
         if(!card->in_suspend)
-            m3_suspend(card->pcidev); /* XXX legal? */
+            m3_suspend(card->pcidev, 3); /* XXX legal? */
     }
     return 0;
 }
 
-static void m3_suspend(struct pci_dev *pci_dev)
+static int m3_suspend(struct pci_dev *pci_dev, u32 state)
 {
     unsigned long flags;
     int i;
@@ -2823,9 +2823,11 @@
     card->in_suspend = 1;
 
     restore_flags(flags);
+
+    return 0;
 }
 
-static void m3_resume(struct pci_dev *pci_dev)
+static int m3_resume(struct pci_dev *pci_dev)
 {
     unsigned long flags;
     int index;
@@ -2904,6 +2906,8 @@
      * when we suspended
      */
     wake_up(&card->suspend_queue);
+
+    return 0;
 }
 
 MODULE_AUTHOR("Zach Brown <zab@zabbo.net>");