Преглед изворни кода

phantom: don't grab other devices

Specify also sub pci ids to not grab devices with properly set sub ids.
This devices has these set (unset) to the same as (plx 9050) ids.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Andreas Block <andreas.block@esd-electronics.com>
Cc: Oliver Thimm <oliver.thimm@esd-electronics.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Jiri Slaby пре 17 година
родитељ
комит
82f560874e
1 измењених фајлова са 4 додато и 3 уклоњено
  1. 4 3
      drivers/misc/phantom.c

+ 4 - 3
drivers/misc/phantom.c

@@ -25,7 +25,7 @@
 #include <asm/atomic.h>
 #include <asm/atomic.h>
 #include <asm/io.h>
 #include <asm/io.h>
 
 
-#define PHANTOM_VERSION		"n0.9.7"
+#define PHANTOM_VERSION		"n0.9.8"
 
 
 #define PHANTOM_MAX_MINORS	8
 #define PHANTOM_MAX_MINORS	8
 
 
@@ -456,8 +456,9 @@ static int phantom_resume(struct pci_dev *pdev)
 #endif
 #endif
 
 
 static struct pci_device_id phantom_pci_tbl[] __devinitdata = {
 static struct pci_device_id phantom_pci_tbl[] __devinitdata = {
-	{ PCI_DEVICE(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050),
-		.class = PCI_CLASS_BRIDGE_OTHER << 8, .class_mask = 0xffff00 },
+	{ .vendor = PCI_VENDOR_ID_PLX, .device = PCI_DEVICE_ID_PLX_9050,
+	  .subvendor = PCI_VENDOR_ID_PLX, .subdevice = PCI_DEVICE_ID_PLX_9050,
+	  .class = PCI_CLASS_BRIDGE_OTHER << 8, .class_mask = 0xffff00 },
 	{ 0, }
 	{ 0, }
 };
 };
 MODULE_DEVICE_TABLE(pci, phantom_pci_tbl);
 MODULE_DEVICE_TABLE(pci, phantom_pci_tbl);