From 52bac4c0cef7c689aaadd70d7416e827101d9d72 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Mon, 8 Dec 2008 16:19:14 +0100 Subject: [PATCH] --- yaml --- r: 139329 b: refs/heads/master c: 4c9c16867e4980fbd7d1fcc9516c9269ecb4d06f h: refs/heads/master i: 139327: f297020a379989b69abb69896db992978f4dd0b2 v: v3 --- [refs] | 2 +- trunk/drivers/pci/quirks.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 347f9ad5a5c0..aac096136f74 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62795041418dd63cd9ff6ff7bbdf1d1c513c189b +refs/heads/master: 4c9c16867e4980fbd7d1fcc9516c9269ecb4d06f diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c index 92b9efe9bcaf..5aa2afb23ef9 100644 --- a/trunk/drivers/pci/quirks.c +++ b/trunk/drivers/pci/quirks.c @@ -1664,9 +1664,13 @@ static void __devinit quirk_netmos(struct pci_dev *dev) * of parallel ports and is the number of serial ports. */ switch (dev->device) { + case PCI_DEVICE_ID_NETMOS_9835: + /* Well, this rule doesn't hold for the following 9835 device */ + if (dev->subsystem_vendor == PCI_VENDOR_ID_IBM && + dev->subsystem_device == 0x0299) + return; case PCI_DEVICE_ID_NETMOS_9735: case PCI_DEVICE_ID_NETMOS_9745: - case PCI_DEVICE_ID_NETMOS_9835: case PCI_DEVICE_ID_NETMOS_9845: case PCI_DEVICE_ID_NETMOS_9855: if ((dev->class >> 8) == PCI_CLASS_COMMUNICATION_SERIAL &&