aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-probe.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-02 13:56:41 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-02 13:56:41 -0500
commitdecdc3f0d664c87761fa1c90733a840b3ca4eccb (patch)
tree35b02cda569fffabde2f8b119a003cc59ca2e2d6 /drivers/ide/ide-probe.c
parentd5bc6592df85dbbb300e0d62af89645602c97551 (diff)
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 <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r--drivers/ide/ide-probe.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 91c352c82725..cab06ac9522a 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)
1260done: 1260done:
1261 blk_register_region(MKDEV(hwif->major, 0), MAX_DRIVES << PARTN_BITS, 1261 blk_register_region(MKDEV(hwif->major, 0), MAX_DRIVES << PARTN_BITS,
1262 THIS_MODULE, ata_probe, ata_lock, hwif); 1262 THIS_MODULE, ata_probe, ata_lock, hwif);
1263 ide_acpi_init(hwif);
1264 return 1; 1263 return 1;
1265 1264
1266out: 1265out:
@@ -1429,6 +1428,8 @@ int ide_device_add_all(u8 *idx, const struct ide_port_info *d)
1429 rc = -1; 1428 rc = -1;
1430 continue; 1429 continue;
1431 } 1430 }
1431
1432 ide_acpi_init(hwif);
1432 } 1433 }
1433 1434
1434 for (i = 0; i < MAX_HWIFS; i++) { 1435 for (i = 0; i < MAX_HWIFS; i++) {