--- maestro3.c.old	Tue Jan 30 14:39:44 2001
+++ maestro3.c	Thu Feb  8 22:17:00 2001
@@ -28,6 +28,11 @@
  * Shouts go out to Mike "DJ XPCom" Ang.
  *
  * History
+ *  v1.22 - Jan 31 2001 - Andres Salomon <dilinger@mp3revolution.net>
+ *   changed m3_notifier() to shut down device manually, instead
+ *   of calling m3_suspend().. the state saving stuff caused
+ *   oopses on machines w/ pm disabled.
+ *   use pci_module_init() instead of pci_register_driver().
  *  v1.20 - Jan 30 2001 - Zach Brown <zab@zabbo.net>
  *   get rid of pm callback and use pci_dev suspend/resume instead
  *   m3_probe cleanups, including pm oops think-o
@@ -147,7 +152,7 @@
 
 #define M_DEBUG 1
 
-#define DRIVER_VERSION      "1.20"
+#define DRIVER_VERSION      "1.22"
 #define M3_MODULE_NAME      "maestro3"
 #define PFX                 M3_MODULE_NAME ": "
 
@@ -277,6 +282,11 @@
     wait_queue_head_t suspend_queue;
 };
 
+
+static int m3_notifier(struct notifier_block *nb, unsigned long event, void *buf);
+static void m3_suspend(struct pci_dev *pci_dev);
+static void check_suspend(struct m3_card *card);
+
 /*
  * an arbitrary volume we set the internal
  * volume settings to so that the ac97 volume
@@ -353,17 +363,11 @@
     return r;
 }
 
-static struct m3_card *devs = NULL;
-
-/*
- * 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 void check_suspend(struct m3_card *card);
 
+static struct m3_card *devs = NULL;
 struct notifier_block m3_reboot_nb = {m3_notifier, NULL, 0};
 
+
 static void m3_outw(struct m3_card *card,
         u16 value, unsigned long reg)
 {
@@ -2750,12 +2754,32 @@
 static int m3_notifier(struct notifier_block *nb, unsigned long event, void *buf)
 {
     struct m3_card *card;
+    int i;
 
     DPRINTK(DPMOD, "notifier suspending all cards\n");
 
-    for(card = devs; card != NULL; card = card->next) {
-        if(!card->in_suspend)
-            m3_suspend(card->pcidev); /* XXX legal? */
+    for (card = devs; card != NULL; card = card->next) {
+        if (!card->in_suspend) {
+            for (i=0;i<NR_DSPS;i++) {
+                struct m3_state *s = &card->channels[i];
+
+                if (s->dev_audio == -1)
+                    continue;
+
+                DPRINTK(DPMOD, "stop_adc/dac() device %d\n",i);
+                stop_dac(s);
+                stop_adc(s);
+            }
+
+            mdelay(10); /* give the assp a chance to idle.. */
+
+            m3_assp_halt(card);
+
+            DPRINTK(DPMOD, "powering down apci regs\n");
+            m3_outw(card, 0xffff, 0x54);
+            m3_outw(card, 0xffff, 0x56);
+
+        }
     }
     return 0;
 }
@@ -2906,21 +2930,15 @@
 
 static int __init m3_init_module(void)
 {
-    if (!pci_present())   /* No PCI bus in this machine! */
-        return -ENODEV;
-
+    int status;
+   
     printk(KERN_INFO PFX "version " DRIVER_VERSION " built at " __TIME__ " " __DATE__ "\n");
 
-    if (register_reboot_notifier(&m3_reboot_nb)) {
-        printk(KERN_WARNING PFX "reboot notifier registration failed\n");
-        return -ENODEV; /* ? */
-    }
+    status = pci_module_init(&m3_pci_driver);
+    if (status == 0)
+        register_reboot_notifier(&m3_reboot_nb); /* never fails */
 
-    if (!pci_register_driver(&m3_pci_driver)) {
-        pci_unregister_driver(&m3_pci_driver);
-        return -ENODEV;
-    }
-    return 0;
+    return status;
 }
 
 static void __exit m3_cleanup_module(void)