summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.osdl.org>2003-11-11 05:15:32 -0800
committerLinus Torvalds <torvalds@home.osdl.org>2003-11-11 05:15:32 -0800
commit205c09cd22a47a2292c22bc06fff8c8eb141d855 (patch)
treef80da008614ff4dfdc345a43a8b525c619888747 /drivers
parent70963396fbdbc75943f5a2532a3e6dd6406cb877 (diff)
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.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ide/pci/alim15x3.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 7c75d4301f86..31d6e9ae7c72 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -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;
}