Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946538AbWKAFtJ (ORCPT ); Wed, 1 Nov 2006 00:49:09 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1946548AbWKAFqF (ORCPT ); Wed, 1 Nov 2006 00:46:05 -0500 Received: from 216-99-217-87.dsl.aracnet.com ([216.99.217.87]:477 "EHLO sous-sol.org") by vger.kernel.org with ESMTP id S1946523AbWKAFpt (ORCPT ); Wed, 1 Nov 2006 00:45:49 -0500 Message-Id: <20061101054550.187618000@sous-sol.org> References: <20061101053340.305569000@sous-sol.org> User-Agent: quilt/0.45-1 Date: Tue, 31 Oct 2006 21:34:37 -0800 From: Chris Wright To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk, Alan Cox Subject: [PATCH 57/61] JMB 368 PATA detection Content-Disposition: inline; filename=jmb-368-pata-detection.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1362 Lines: 39 -stable review patch. If anyone has any objections, please let us know. ------------------ From: Alan Cox The Jmicron JMB368 is PATA only so has the PATA on function zero. Don't therefore skip function zero on this device when probing Signed-off-by: Alan Cox Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright --- drivers/ide/pci/generic.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- linux-2.6.18.1.orig/drivers/ide/pci/generic.c +++ linux-2.6.18.1/drivers/ide/pci/generic.c @@ -242,8 +242,10 @@ static int __devinit generic_init_one(st (!(PCI_FUNC(dev->devfn) & 1))) goto out; - if (dev->vendor == PCI_VENDOR_ID_JMICRON && PCI_FUNC(dev->devfn) != 1) - goto out; + if (dev->vendor == PCI_VENDOR_ID_JMICRON) { + if (dev->device != PCI_DEVICE_ID_JMICRON_JMB368 && PCI_FUNC(dev->devfn) != 1) + goto out; + } if (dev->vendor != PCI_VENDOR_ID_JMICRON) { pci_read_config_word(dev, PCI_COMMAND, &command); -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/