---

yaml
---
r: 77247
b: refs/heads/master
c: 2e13093
h: refs/heads/master
i:
  77245: 17f0f63
  77243: b51869e
  77239: 58ebfef
  77231: 2a5ff60
  77215: cb38b2a
  77183: 9c3dbdd
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba6560aa45fc498125b07130784ec5ca8a6922a6
+refs/heads/master: 2e13093a834ddbbf92701d477e69c9018959a82c

trunk/drivers/ide/ide-probe.c

@@ -1382,16 +1382,28 @@ 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 "
 					 "interface\n", hwif->name);
 			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);