]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ide: move ide_acpi_init() call to ide_device_add_all()
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sat, 2 Feb 2008 18:56:41 +0000 (19:56 +0100)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sat, 2 Feb 2008 18:56:41 +0000 (19:56 +0100)
There should be no functionality changes caused by this patch.

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

index 91c352c8272509cb6d48d4e8b27b02efd49c6ac6..cab06ac9522abf0d20096df2f6c4818dd0119236 100644 (file)
@@ -1260,7 +1260,6 @@ static int hwif_init(ide_hwif_t *hwif)
 done:
        blk_register_region(MKDEV(hwif->major, 0), MAX_DRIVES << PARTN_BITS,
                            THIS_MODULE, ata_probe, ata_lock, hwif);
-       ide_acpi_init(hwif);
        return 1;
 
 out:
@@ -1429,6 +1428,8 @@ int ide_device_add_all(u8 *idx, const struct ide_port_info *d)
                        rc = -1;
                        continue;
                }
+
+               ide_acpi_init(hwif);
        }
 
        for (i = 0; i < MAX_HWIFS; i++) {