Messages in this thread Patch in this message | | | Date | Mon, 1 Nov 2004 19:30:21 GMT | From | dhowells@redhat ... | Subject | [PATCH 6/14] FRV: IDE fixes |
| |
The attached patch fixes the IDE driver to initialise correctly in the case that IDE_ARCH_OBSOLETE_INIT is not defined.
Signed-Off-By: dhowells@redhat.com --- diffstat frv-ide-2610rc1bk10.diff setup-pci.c | 5 +++++ 1 files changed, 5 insertions(+)
diff -uNr /warthog/kernels/linux-2.6.10-rc1-bk10/drivers/ide/setup-pci.c linux-2.6.10-rc1-bk10-frv/drivers/ide/setup-pci.c --- /warthog/kernels/linux-2.6.10-rc1-bk10/drivers/ide/setup-pci.c 2004-11-01 11:45:23.000000000 +0000 +++ linux-2.6.10-rc1-bk10-frv/drivers/ide/setup-pci.c 2004-11-01 11:47:04.826660626 +0000 @@ -425,7 +425,12 @@ if (hwif->io_ports[IDE_DATA_OFFSET] != base || hwif->io_ports[IDE_CONTROL_OFFSET] != (ctl | 2)) { memset(&hwif->hw, 0, sizeof(hwif->hw)); +#ifndef IDE_ARCH_OBSOLETE_INIT + ide_std_init_ports(&hwif->hw, base, (ctl | 2)); + hwif->hw.io_ports[IDE_IRQ_OFFSET] = 0; +#else ide_init_hwif_ports(&hwif->hw, base, (ctl | 2), NULL); +#endif memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->io_ports)); hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET]; } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |