From decdc3f0d664c87761fa1c90733a840b3ca4eccb Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Sat, 2 Feb 2008 19:56:41 +0100 Subject: [PATCH] ide: move ide_acpi_init() call to ide_device_add_all() There should be no functionality changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ide/ide-probe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 91c352c..cab06ac 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c @@ -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++) { -- 2.7.4