diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2006-10-28 10:38:57 -0700 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2006-11-03 17:33:50 -0800 |
| commit | a5f1d1d1849ca848c0ab49dd987070415ad2ede5 (patch) | |
| tree | d1a513b9dc2849e8bc02a761dea4f1147607e540 | |
| parent | e17f8851e194c759c35e058d9692e81a3eec8a1e (diff) | |
[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>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
| -rw-r--r-- | drivers/ide/pci/generic.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c index 6a1ddad25b26..58e8efaf03f7 100644 --- a/drivers/ide/pci/generic.c +++ b/drivers/ide/pci/generic.c @@ -242,8 +242,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); |