From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765550AbZDAOQT (ORCPT ); Wed, 1 Apr 2009 10:16:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932424AbZDAOHl (ORCPT ); Wed, 1 Apr 2009 10:07:41 -0400 Received: from earthlight.etchedpixels.co.uk ([81.2.110.250]:37795 "EHLO www.etchedpixels.co.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932467AbZDAOHg (ORCPT ); Wed, 1 Apr 2009 10:07:36 -0400 From: Alan Cox Subject: [PATCH 23/24] PCI: quirks, don't mark one netmos as class other To: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org Date: Wed, 01 Apr 2009 15:07:51 +0100 Message-ID: <20090401140747.22882.76124.stgit@localhost.localdomain> In-Reply-To: <20090401140241.22882.93477.stgit@localhost.localdomain> References: <20090401140241.22882.93477.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiri Slaby Let it as serial, since it doesn't have subdevice in the form of 0x00PS. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Alan Cox --- drivers/pci/quirks.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 92b9efe..5aa2afb 100644 --- a/drivers/pci/quirks.c +++ b/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 &&