From 1908121bc16a08328489e76313c738867d1f2623 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sat, 26 Jan 2008 20:13:04 +0100
Subject: [PATCH] --- yaml --- r: 77247 b: refs/heads/master c:
 2e13093a834ddbbf92701d477e69c9018959a82c h: refs/heads/master i:   77245:
 17f0f63b1c8393b2566d767ada6d6837546dfaed   77243:
 b51869eae86b42e5a2a20dd3e48650f3bf0bb3db   77239:
 58ebfef346e3bae16f60809944ffff52e4315898   77231:
 2a5ff607d23f45295ceee39f2fc6318e0bbe9ab1   77215:
 cb38b2a957ebb84147403377e0d3682f1e616a26   77183:
 9c3dbdd75fefe56e16494f5813f2f2038918ef1d v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/ide/ide-probe.c | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e2e253da8f5f..1eb0952aefec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba6560aa45fc498125b07130784ec5ca8a6922a6
+refs/heads/master: 2e13093a834ddbbf92701d477e69c9018959a82c
diff --git a/trunk/drivers/ide/ide-probe.c b/trunk/drivers/ide/ide-probe.c
index bfcc8078b092..817564fba820 100644
--- a/trunk/drivers/ide/ide-probe.c
+++ b/trunk/drivers/ide/ide-probe.c
@@ -1382,9 +1382,14 @@ int ide_device_add(u8 idx[4])
 		if (idx[i] == 0xff)
 			continue;
 
-		hwif = &ide_hwifs[idx[i]];
+		probe_hwif(&ide_hwifs[idx[i]]);
+	}
 
-		probe_hwif(hwif);
+	for (i = 0; i < 4; i++) {
+		if (idx[i] == 0xff)
+			continue;
+
+		hwif = &ide_hwifs[idx[i]];
 
 		if (hwif_init(hwif) == 0) {
 			printk(KERN_INFO "%s: failed to initialize IDE "
@@ -1392,6 +1397,13 @@ int ide_device_add(u8 idx[4])
 			rc = -1;
 			continue;
 		}
+	}
+
+	for (i = 0; i < 4; i++) {
+		if (idx[i] == 0xff)
+			continue;
+
+		hwif = &ide_hwifs[idx[i]];
 
 		if (hwif->present)
 			hwif_register_devices(hwif);