Commit 4734c153 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Linus Torvalds

[PATCH] fix default IDE interfaces initialization for PPC32

In ide_init_default_irq() patch I overlooked that ppc_ide_md.init_hwif_ports()
called from generic ide_init_hwif_ports() can set hwif->irq and it will
be overwritten by ide_init_default_irq() if CONFIG_PCI is defined.  Fix
it.

I will clean it up properly later after killing ide_init_hwif_ports() on
ARM{26}.  Doing it now is just wasted effort.
parent cd6f2953
...@@ -307,8 +307,10 @@ static void __init init_ide_data (void) ...@@ -307,8 +307,10 @@ static void __init init_ide_data (void)
hwif = &ide_hwifs[index]; hwif = &ide_hwifs[index];
init_hwif_data(hwif, index); init_hwif_data(hwif, index);
init_hwif_default(hwif, index); init_hwif_default(hwif, index);
#if !defined(CONFIG_PPC32) || !defined(CONFIG_PCI)
hwif->irq = hwif->hw.irq = hwif->irq = hwif->hw.irq =
ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]); ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]);
#endif
} }
/* OBSOLETE: still needed on arm26 and arm */ /* OBSOLETE: still needed on arm26 and arm */
......
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