Commit 205c09cd authored by Linus Torvalds's avatar Linus Torvalds

Fix ALI 15x3 IDE driver oops

It would oops on any machines that had an ALI northbridge but
didn't have the exact ISA bridge we expected.
parent 70963396
......@@ -578,7 +578,6 @@ static unsigned int __init init_chipset_ali15x3 (struct pci_dev *dev, const char
{
unsigned long flags;
u8 tmpbyte;
struct pci_dev *north = pci_find_slot(0, PCI_DEVFN(0,0));
pci_read_config_byte(dev, PCI_REVISION_ID, &m5229_revision);
......@@ -625,11 +624,9 @@ static unsigned int __init init_chipset_ali15x3 (struct pci_dev *dev, const char
/*
* We should only tune the 1533 enable if we are using an ALi
* North bridge. We might have no north found on some zany
* box without a device at 0:0.0. The ALi bridge will be at
* 0:0.0 so if we didn't find one we know what is cooking.
* south bridge.
*/
if (north && north->vendor != PCI_VENDOR_ID_AL) {
if (!isa_dev) {
local_irq_restore(flags);
return 0;
}
......
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