From: Ian Campbell <Ian.Campbell@citrix.com>
Date: Mon, 2 Feb 2009 19:12:22 +0000 (+0100)
Subject: IDE: Unregister and disable devices if initialization fails.
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=51d6ac7011cc354eade4f1282857947930a905aa;p=linux-2.6-omap-h63xx.git

IDE: Unregister and disable devices if initialization fails.

On reboot the loop in device_shutdown gets confused by these partially
initialized devices and goes into an infinite loop. Therefore unregister
and disable these devices.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
[bart: remove leftover hwif->present clearing + update patch description]
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 6bab2ac1f5b..ce0818a993f 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1549,7 +1549,8 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
 		if (hwif_init(hwif) == 0) {
 			printk(KERN_INFO "%s: failed to initialize IDE "
 					 "interface\n", hwif->name);
-			hwif->present = 0;
+			device_unregister(&hwif->gendev);
+			ide_disable_port(hwif);
 			continue;
 		}