From 63e556fe0722b38eebdd6dfe15612417593d728c Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Wed, 11 Feb 2009 13:04:40 -0800 Subject: [PATCH] --- yaml --- r: 131295 b: refs/heads/master c: 3abdbf90a3ffb006108c831c56b092e35483b6ec h: refs/heads/master i: 131293: 1a2c1fe93cea1dc8cccacff98316fcb67db40172 131291: 6f3ce294e9bb57892dc7dfbc774684f1ede33b21 131287: 5f607db66220330adf2ea520aa6142d765618576 131279: 0a9953c7d37992c6410752930e43348046f18b50 131263: 2ba13b79e734df0315ec0d12740406535a79385c v: v3 --- [refs] | 2 +- trunk/drivers/parport/parport_serial.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6e73a24d7682..ecc81d2b02d1 100644 --- 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 index 101ed49a2d15..032db815b0f9 100644 --- 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

is the number of