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

• Lines: 49
• Date: Sat Apr 21 10:36:30 2001
• Orig file: v2.4.3/linux/drivers/sound/maestro3.c
• Orig date: Fri Mar 2 18:38:39 2001

diff -u --recursive --new-file v2.4.3/linux/drivers/sound/maestro3.c linux/drivers/sound/maestro3.c
@@ -81,7 +81,7 @@
  *  do the real work.  The kernel presumably jumps into each of them in turn.
  *  These code images tend to have their own data area, and one can have
  *  multiple data areas representing different states for each of the 'client
- *  instance' code portions.  There is generaly a list in the kernel data
+ *  instance' code portions.  There is generally a list in the kernel data
  *  that points to the data instances for a given piece of code.
  *
  *  We've only been given the binary image for the 'minisrc', mini sample 
@@ -2307,6 +2307,8 @@
     codec->private_data = card;
     codec->codec_read = m3_ac97_read;
     codec->codec_write = m3_ac97_write;
+    /* someday we should support secondary codecs.. */
+    codec->id = 0;
 
     if (ac97_probe_codec(codec) == 0) {
         printk(KERN_ERR PFX "codec probe failed\n");
@@ -2595,18 +2597,16 @@
 
     DPRINTK(DPMOD, "in maestro_install\n");
 
-    if (!pci_dma_supported(pci_dev, M3_PCI_DMA_MASK)) {
+    if (pci_enable_device(pci_dev))
+        return -EIO;
+
+    if (pci_set_dma_mask(pci_dev, M3_PCI_DMA_MASK)) {
         printk(KERN_ERR PFX "architecture does not support limiting to 28bit PCI bus addresses\n");
         return -ENODEV;
     }
         
-    if (pci_enable_device(pci_dev))
-        return -EIO;
-
     pci_set_master(pci_dev);
 
-    pci_dev->dma_mask = M3_PCI_DMA_MASK;
-
     if( (card = kmalloc(sizeof(struct m3_card), GFP_KERNEL)) == NULL) {
         printk(KERN_WARNING PFX "out of memory\n");
         return -ENOMEM;
@@ -2936,6 +2936,7 @@
 
     if (!pci_register_driver(&m3_pci_driver)) {
         pci_unregister_driver(&m3_pci_driver);
+        unregister_reboot_notifier(&m3_reboot_nb);
         return -ENODEV;
     }
     return 0;