From 413d88523ffb6743775af80e50def6e706ad351a Mon Sep 17 00:00:00 2001
From: Ian Campbell <Ian.Campbell@citrix.com>
Date: Mon, 2 Feb 2009 20:12:22 +0100
Subject: [PATCH] --- yaml --- r: 130719 b: refs/heads/master c:
 51d6ac7011cc354eade4f1282857947930a905aa h: refs/heads/master i:   130717:
 6327874b2b8343fd3b428561b44b9ade170160ad   130715:
 c5fec0947b059dbd11d7f3dbda9ce797d61e5343   130711:
 67c7d2657d3741989e04063172496e023b65c83e   130703:
 9e8f25eb847722299a67d3613f1570dff8857edf   130687:
 b1ab60a419ef903cb782bb8109798127f7e7d808 v: v3

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

diff --git a/[refs] b/[refs]
index 44e924b7d06a..c328cc20eb7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a100f4b78c4c59fdd1cc38c5fa6a1ec66f23d9a
+refs/heads/master: 51d6ac7011cc354eade4f1282857947930a905aa
diff --git a/trunk/drivers/ide/ide-probe.c b/trunk/drivers/ide/ide-probe.c
index 6bab2ac1f5b9..ce0818a993f6 100644
--- a/trunk/drivers/ide/ide-probe.c
+++ b/trunk/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;
 		}