aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-01-06 11:21:00 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-01-06 11:21:00 -0500
commite630fcbe9399e0cfec097f516b758680f2b2bdaa (patch)
tree4c76d93b6089646eb273dd5da0e15f216f716936
parentc38714ed4447874db1e06908f713fe65afba4a85 (diff)
ide: fix ide_port_scan() to do ACPI setup after initializing request queues
This makes ide_port_scan()'s behavior match ide_host_register()'s one and fixes OOPS in elv_may_queue() during port re-scan. Reported-and-tested-by: Bruno Prémont <bonbons@linux-vserver.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r--drivers/ide/ide-probe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index f71f4eb4705a..ebb1b7f863f4 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1694,8 +1694,8 @@ void ide_port_scan(ide_hwif_t *hwif)
1694 hwif->present = 1; 1694 hwif->present = 1;
1695 1695
1696 ide_port_tune_devices(hwif); 1696 ide_port_tune_devices(hwif);
1697 ide_acpi_port_init_devices(hwif);
1698 ide_port_setup_devices(hwif); 1697 ide_port_setup_devices(hwif);
1698 ide_acpi_port_init_devices(hwif);
1699 hwif_register_devices(hwif); 1699 hwif_register_devices(hwif);
1700 ide_proc_port_register_devices(hwif); 1700 ide_proc_port_register_devices(hwif);
1701} 1701}