From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Tue, 6 Jan 2009 16:21:00 +0000 (+0100)
Subject: ide: fix ide_port_scan() to do ACPI setup after initializing request queues
X-Git-Tag: v2.6.29-rc1~231^2~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e630fcbe9399e0cfec097f516b758680f2b2bdaa;p=karo-tx-linux.git

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>
---

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)
 	hwif->present = 1;
 
 	ide_port_tune_devices(hwif);
-	ide_acpi_port_init_devices(hwif);
 	ide_port_setup_devices(hwif);
+	ide_acpi_port_init_devices(hwif);
 	hwif_register_devices(hwif);
 	ide_proc_port_register_devices(hwif);
 }