---

yaml --- r: 131295 b: refs/heads/master c: 3abdbf9 h: refs/heads/master i: 131293: 1a2c1fe 131291: 6f3ce29 131287: 5f607db 131279: 0a9953c 131263: 2ba13b7 v: v3
git-mirror · Feb 11, 2009 · 63e556f · 63e556f
1 parent 2796776
commit 63e556f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89e1219004b3657cc014521663eeef0744f1c99d
+refs/heads/master: 3abdbf90a3ffb006108c831c56b092e35483b6ec
diff --git a/trunk/drivers/parport/parport_serial.c b/trunk/drivers/parport/parport_serial.c
@@ -64,6 +64,11 @@ struct parport_pc_pci {
 
 static int __devinit netmos_parallel_init(struct pci_dev *dev, struct parport_pc_pci *card, int autoirq, int autodma)
 {
+	/* the rule described below doesn't hold for this device */
+	if (dev->device == PCI_DEVICE_ID_NETMOS_9835 &&
+			dev->subsystem_vendor == PCI_VENDOR_ID_IBM &&
+			dev->subsystem_device == 0x0299)
+		return -ENODEV;
 	/*
 	 * Netmos uses the subdevice ID to indicate the number of parallel
 	 * and serial ports.  The form is 0x00PS, where <P> is the number of