[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>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index 965c43659e35..5b77a5bcbf0c 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: