aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-02 13:56:38 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-02 13:56:38 -0500
commitead741df385607ab74876afdb05fd8ac27da9906 (patch)
treed2293a1369580250277f0ffc718cec597fb284d6
parent2244e850632f82466d7c041546326c7055fc7159 (diff)
ide: remove redundant init_hwif_default() call from ide_register_hw()
ide_init_port_hw() call overrides setup done by init_hwif_default(). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r--drivers/ide/ide.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index a71591ab0c5f..4b130e7102eb 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -716,10 +716,8 @@ int ide_register_hw(hw_regs_t *hw, void (*quirkproc)(ide_drive_t *),
716found: 716found:
717 if (hwif->present) 717 if (hwif->present)
718 ide_unregister(index); 718 ide_unregister(index);
719 else if (!hwif->hold) { 719 else if (!hwif->hold)
720 ide_init_port_data(hwif, index); 720 ide_init_port_data(hwif, index);
721 init_hwif_default(hwif, index);
722 }
723 721
724 ide_init_port_hw(hwif, hw); 722 ide_init_port_hw(hwif, hw);
725 hwif->quirkproc = quirkproc; 723 hwif->quirkproc = quirkproc;