---

yaml --- r: 130719 b: refs/heads/master c: 51d6ac7 h: refs/heads/master i: 130717: 6327874 130715: c5fec09 130711: 67c7d26 130703: 9e8f25e 130687: b1ab60a v: v3
git-mirror · Feb 2, 2009 · 413d885 · 413d885
1 parent 94b57df
commit 413d885
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;
 		}