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@xxxxxxxxx>
---
drivers/ide/ide-probe.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
Index: b/drivers/ide/ide-probe.c
===================================================================
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1389,9 +1389,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 "
@@ -1399,6 +1404,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);
-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
