Commit 3719bc5c authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e5657933
...@@ -237,10 +237,12 @@ static int __devinit generic_init_one(struct pci_dev *dev, const struct pci_devi ...@@ -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) if (dev->vendor == PCI_VENDOR_ID_JMICRON && PCI_FUNC(dev->devfn) != 1)
goto out; goto out;
pci_read_config_word(dev, PCI_COMMAND, &command); if (dev->vendor != PCI_VENDOR_ID_JMICRON) {
if (!(command & PCI_COMMAND_IO)) { pci_read_config_word(dev, PCI_COMMAND, &command);
printk(KERN_INFO "Skipping disabled %s IDE controller.\n", d->name); if (!(command & PCI_COMMAND_IO)) {
goto out; printk(KERN_INFO "Skipping disabled %s IDE controller.\n", d->name);
goto out;
}
} }
ret = ide_setup_pci_device(dev, d); ret = ide_setup_pci_device(dev, d);
out: out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment