Changeset 520

Timestamp:

Jul 21, 2010, 5:13:17 PM (15 years ago)

Author:

David Azarewicz

Message:

pci dereg fix

Location:

GPL/trunk

Files:

• alsa-kernel/pci/hda/hda_intel.c (modified) (6 diffs)
• lib32/pci.c (modified) (1 diff)

GPL/trunk/alsa-kernel/pci/hda/hda_intel.c

@@ -32 +32 @@
  *
  *  2004.12.01  Major rewrite by tiwai, merged the work of pshou
- * 
+ *
  */
 
@@ -346 +346 @@
 #ifdef TARGET_OS2
         volatile void __iomem *sd_addr;         /* stream descriptor pointer */
-#else 
+#else
         void __iomem *sd_addr;  /* stream descriptor pointer */
 #endif
@@ -480 +480 @@
         [AZX_DRIVER_ULI] = "HDA ULI M5461",
         [AZX_DRIVER_NVIDIA] = "HDA NVidia",
-        [AZX_DRIVER_TERA] = "HDA Teradici", 
+        [AZX_DRIVER_TERA] = "HDA Teradici",
         [AZX_DRIVER_GENERIC] = "HD-Audio Generic",
 };
@@ -915 +915 @@
 /*
  * Lowlevel interface
- */  
+ */
 
 /* enable interrupts */
@@ -1055 +1055 @@
                 /* For ATI SB450 azalia HD audio, we need to enable snoop */
                 update_pci_byte(chip->pci,
-                                ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR, 
+                                ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR,
                                 0x07, ATI_SB450_HDAUDIO_ENABLE_SNOOP);
                 break;
@@ -2712 +2712 @@
         { PCI_DEVICE(0x10b9, 0x5461), .driver_data = AZX_DRIVER_ULI },
         /* NVIDIA MCP */
-        { PCI_DEVICE(0x10de, 0x026c), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x0371), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x03e4), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x03f0), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x044a), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x044b), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x055c), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x055d), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x0774), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x0775), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x0776), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x0777), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x07fc), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x07fd), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x0ac0), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x0ac1), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x0ac2), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x0ac3), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x0d94), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x0d95), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x0d96), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x0d97), .driver_data = AZX_DRIVER_NVIDIA },
+        { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID),
+          .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
+          .class_mask = 0xffffff,
+          .driver_data = AZX_DRIVER_NVIDIA },
         /* Teradici */
         { PCI_DEVICE(0x6549, 0x1200), .driver_data = AZX_DRIVER_TERA },

GPL/trunk/lib32/pci.c

@@ -547 +547 @@
 {
         struct pci_dev *pcidev;
-        int i = 0, j;
-
-        while(driver->id_table[i].vendor)
-        {
-                for(j=0;j<MAX_PCI_DEVICES;j++)
-                {
-                        if(pci_devices[j].vendor == driver->id_table[i].vendor &&
-                           pci_devices[j].device == driver->id_table[i].device)
-                        {
-                                if(driver->remove) {
-                                        driver->remove(&pci_devices[j]);
-                                }
-                        }
-                }
-                i++;
+        int i, j;
+
+        for (i=0; driver->id_table[i].vendor; i++) {
+                for(j=0; j<MAX_PCI_DEVICES; j++) {
+                        pcidev = &pci_devices[j];
+                        if (pcidev->devfn == 0) continue;
+                        if(pcidev->vendor != driver->id_table[i].vendor) continue;
+                        if ( (driver->id_table[i].device != PCI_ANY_ID) && (pcidev->device != driver->id_table[i].device) ) continue;
+                        dprintf(("pci unreg match: %x:%x %x:%x", pci_devices[j].vendor, pci_devices[j].device, driver->id_table[i].vendor, driver->id_table[i].device));
+                        if(!driver->remove) continue;
+                        driver->remove(pcidev);
+                }
         }
         return 0;