]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ide: remove redundant init_hwif_default() call from ide_register_hw()
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sat, 2 Feb 2008 18:56:38 +0000 (19:56 +0100)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sat, 2 Feb 2008 18:56:38 +0000 (19:56 +0100)
ide_init_port_hw() call overrides setup done by init_hwif_default().

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/ide.c

index a71591ab0c5f9cd152351993606a0dd3d1e8886b..4b130e7102eb1ce2faeb44847a49edf9d1985f19 100644 (file)
@@ -716,10 +716,8 @@ int ide_register_hw(hw_regs_t *hw, void (*quirkproc)(ide_drive_t *),
 found:
        if (hwif->present)
                ide_unregister(index);
-       else if (!hwif->hold) {
+       else if (!hwif->hold)
                ide_init_port_data(hwif, index);
-               init_hwif_default(hwif, index);
-       }
 
        ide_init_port_hw(hwif, hw);
        hwif->quirkproc = quirkproc;