[PATCH 17/22] ide: move ide_acpi_init() call to ide_device_add_all()

Bartlomiej Zolnierkiewicz
2008-01-16T23:20:39Z

There should be no functionality changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
drivers/ide/ide-probe.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Index: b/drivers/ide/ide-probe.c
===================================================================
--- 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[MAX_HWIFS]
rc = -1;
continue;
}
+
+ ide_acpi_init(hwif);
}

for (i = 0; i < MAX_HWIFS; i++) {