summaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2006-10-11 01:21:47 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-11 11:14:21 -0700
commit3719bc5c22c9025bf1c909fe8b527ebf1de9a153 (patch)
treec8903738ba172c57c007292e72b0a5c671fe0e1a /drivers/ide
parente5657933863f43cc6bb76a54d659303dafaa9e58 (diff)
downloadop-kernel-dev-3719bc5c22c9025bf1c909fe8b527ebf1de9a153.zip
op-kernel-dev-3719bc5c22c9025bf1c909fe8b527ebf1de9a153.tar.gz
[PATCH] ide-generic: jmicron fix
Some people find their Jmicron pata port reports its disabled even though it has devices on it and was boot probed. Fix this (Candidate for 2.6.18.*, less so for 2.6.19 as we've got a proper jmicron driver on the merge for that to replace ide-generic support) 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.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index 965c436..5b77a5b 100644
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -237,10 +237,12 @@ static int __devinit generic_init_one(struct pci_dev *dev, const struct pci_devi
if (dev->vendor == PCI_VENDOR_ID_JMICRON && PCI_FUNC(dev->devfn) != 1)
goto out;
- pci_read_config_word(dev, PCI_COMMAND, &command);
- if (!(command & PCI_COMMAND_IO)) {
- printk(KERN_INFO "Skipping disabled %s IDE controller.\n", d->name);
- goto out;
+ if (dev->vendor != PCI_VENDOR_ID_JMICRON) {
+ pci_read_config_word(dev, PCI_COMMAND, &command);
+ if (!(command & PCI_COMMAND_IO)) {
+ printk(KERN_INFO "Skipping disabled %s IDE controller.\n", d->name);
+ goto out;
+ }
}
ret = ide_setup_pci_device(dev, d);
out:
OpenPOWER on IntegriCloud