aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-19 18:32:32 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-19 18:32:32 -0400
commit8f173b5bf460a85791c131e774dc992f8cd578c1 (patch)
treea33a7357bf5b0987cb7e0cbb2250eca4b3281e75 /drivers/ide
parent847ddd2bbe15c6e452606503b5d073826aaaddb7 (diff)
ide: fix ide_register_hw() to check hwif->io_ports[]
hwif->hw.io_ports[] and hwif->io_ports[] should be the same but "4drives" support and scc_pata host driver set only hwif->io_ports[]. To compensate for this check hwif->io_ports[] instead of hwif->hw.io_ports[] in ide_register_hw() (instead of fixing "4drives" and scc_pata because hwif->hw is to be removed). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index ce6644f41b21..9284f64bc2ee 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -707,7 +707,7 @@ int ide_register_hw(hw_regs_t *hw, void (*fixup)(ide_hwif_t *),
707 do { 707 do {
708 for (index = 0; index < MAX_HWIFS; ++index) { 708 for (index = 0; index < MAX_HWIFS; ++index) {
709 hwif = &ide_hwifs[index]; 709 hwif = &ide_hwifs[index];
710 if (hwif->hw.io_ports[IDE_DATA_OFFSET] == hw->io_ports[IDE_DATA_OFFSET]) 710 if (hwif->io_ports[IDE_DATA_OFFSET] == hw->io_ports[IDE_DATA_OFFSET])
711 goto found; 711 goto found;
712 } 712 }
713 for (index = 0; index < MAX_HWIFS; ++index) { 713 for (index = 0; index < MAX_HWIFS; ++index) {
@@ -715,7 +715,7 @@ int ide_register_hw(hw_regs_t *hw, void (*fixup)(ide_hwif_t *),
715 if (hwif->hold) 715 if (hwif->hold)
716 continue; 716 continue;
717 if ((!hwif->present && !hwif->mate && !initializing) || 717 if ((!hwif->present && !hwif->mate && !initializing) ||
718 (!hwif->hw.io_ports[IDE_DATA_OFFSET] && initializing)) 718 (!hwif->io_ports[IDE_DATA_OFFSET] && initializing))
719 goto found; 719 goto found;
720 } 720 }
721 for (index = 0; index < MAX_HWIFS; index++) 721 for (index = 0; index < MAX_HWIFS; index++)