---

yaml
---
r: 147927
b: refs/heads/master
c: a20b2a4
h: refs/heads/master
i:
  147925: 5377195
  147923: 7e660f2
  147919: 760ae25
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75c2d7d71a85d02594da07d5d2ad587451b64b02
+refs/heads/master: a20b2a44eca52818ef52a94959480b7e6ea2f528

trunk/drivers/ide/ide-probe.c

@@ -702,8 +702,14 @@ static int ide_probe_port(ide_hwif_t *hwif)
 	if (irqd)
 		disable_irq(hwif->irq);
 
-	if (ide_port_wait_ready(hwif) == -EBUSY)
-		printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name);
+	rc = ide_port_wait_ready(hwif);
+	if (rc == -ENODEV) {
+		printk(KERN_INFO "%s: no devices on the port\n", hwif->name);
+		goto out;
+	} else if (rc == -EBUSY)
+		printk(KERN_ERR "%s: not ready before the probe\n", hwif->name);
+	else
+		rc = -ENODEV;
 
 	/*
 	 * Second drive should only exist if first drive was found,
@@ -714,7 +720,7 @@ static int ide_probe_port(ide_hwif_t *hwif)
 		if (drive->dev_flags & IDE_DFLAG_PRESENT)
 			rc = 0;
 	}
-
+out:
 	/*
 	 * Use cached IRQ number. It might be (and is...) changed by probe
 	 * code above