summaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2006-10-28 10:38:57 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-28 11:30:55 -0700
commitc333526f489044be2b93085720eb898f0037b346 (patch)
treef4b75fcc7fd139d0e8caed56b0240ae31d027256 /drivers/ide
parent8fa1d7d3b2c51594c0f3aa151983dd51f605e07d (diff)
downloadop-kernel-dev-c333526f489044be2b93085720eb898f0037b346.zip
op-kernel-dev-c333526f489044be2b93085720eb898f0037b346.tar.gz
[PATCH] JMB 368 PATA detection
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 <alan@redhat.com> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/pci/generic.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index ad418ce..e72ab36 100644
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -247,8 +247,10 @@ static int __devinit generic_init_one(struct pci_dev *dev, const struct pci_devi
(!(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);
OpenPOWER on IntegriCloud