From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sat, 26 Jan 2008 19:13:04 +0000 (+0100)
Subject: ide: fix probing for hosts with serialized or IRQ sharing interfaces
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2e13093a834ddbbf92701d477e69c9018959a82c;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

ide: fix probing for hosts with serialized or IRQ sharing interfaces

After hwif_register_devices() IDE devices are ready to be used so
the way in which ide_device_add() works currently is racy for hosts
with serialized / IRQ sharing interfaces.

Fix ide_device_add() by looping over interfaces for probe_hwif(),
hwif_init() and hwif_register_devices() operations.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index bfcc8078b092..817564fba820 100644
--- a/drivers/ide/ide-probe.c
+++ b/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);