From: Jiri Slaby Date: Wed, 11 Feb 2009 21:04:40 +0000 (-0800) Subject: parport: parport_serial, don't bind netmos ibm 0299 X-Git-Tag: v2.6.28.6~43 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=898f09e0b81b78acfe42e5b1713a0f2aa5e2e73d;p=karo-tx-linux.git parport: parport_serial, don't bind netmos ibm 0299 commit 3abdbf90a3ffb006108c831c56b092e35483b6ec upstream. Since netmos 9835 with subids 0x1014(IBM):0x0299 is now bound with serial/8250_pci, because it has no parallel ports and subdevice id isn't in the expected form, return -ENODEV from probe function. This is performed in netmos preinit_hook. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c index 101ed49a2d15..032db815b0f9 100644 --- a/drivers/parport/parport_serial.c +++ b/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

is the number of