aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
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 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
237 if (dev->vendor == PCI_VENDOR_ID_JMICRON && PCI_FUNC(dev->devfn) != 1) 237 if (dev->vendor == PCI_VENDOR_ID_JMICRON && PCI_FUNC(dev->devfn) != 1)
238 goto out; 238 goto out;
239 239
240 pci_read_config_word(dev, PCI_COMMAND, &command); 240 if (dev->vendor != PCI_VENDOR_ID_JMICRON) {
241 if (!(command & PCI_COMMAND_IO)) { 241 pci_read_config_word(dev, PCI_COMMAND, &command);
242 printk(KERN_INFO "Skipping disabled %s IDE controller.\n", d->name); 242 if (!(command & PCI_COMMAND_IO)) {
243 goto out; 243 printk(KERN_INFO "Skipping disabled %s IDE controller.\n", d->name);
244 goto out;
245 }
244 } 246 }
245 ret = ide_setup_pci_device(dev, d); 247 ret = ide_setup_pci_device(dev, d);
246out: 248out: