diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2009-02-11 13:04:40 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-17 09:28:46 -0800 |
| commit | 898f09e0b81b78acfe42e5b1713a0f2aa5e2e73d (patch) | |
| tree | a276029cfbdbb6bf151f0c1221488b91f0ac51d8 | |
| parent | 1124f855be1abd0a605fec7f3d1d6c1eb21f9354 (diff) | |
| download | lwn-898f09e0b81b78acfe42e5b1713a0f2aa5e2e73d.tar.gz lwn-898f09e0b81b78acfe42e5b1713a0f2aa5e2e73d.zip | |
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 <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/parport/parport_serial.c | 5 |
1 files changed, 5 insertions, 0 deletions
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 <P> is the number of |