summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-03-28 18:58:28 -0700
committerDavid S. Miller <davem@davemloft.net>2010-03-28 18:58:28 -0700
commit9ce41aed0d392246eb788786253f242e829fd5e1 (patch)
tree1d6c9f820becf2fedec4d768bbb4a83dda235b72
parente4afb29fa3ea759d408fa537ab6a81800708396e (diff)
downloadlinux-3.10-9ce41aed0d392246eb788786253f242e829fd5e1.tar.gz
linux-3.10-9ce41aed0d392246eb788786253f242e829fd5e1.tar.bz2
linux-3.10-9ce41aed0d392246eb788786253f242e829fd5e1.zip
Revert "ide: skip probe if there are no devices on the port (v2)"
This reverts commit a20b2a44eca52818ef52a94959480b7e6ea2f528. As requested by David Fries. This makes CDROMs which are slave drives on a ribbon without a master disappear and causes other similar kinds of badness. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/ide/ide-probe.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index fbedd35feb4..4c3d1bfec0c 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -695,14 +695,8 @@ static int ide_probe_port(ide_hwif_t *hwif)
if (irqd)
disable_irq(hwif->irq);
- 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;
+ if (ide_port_wait_ready(hwif) == -EBUSY)
+ printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name);
/*
* Second drive should only exist if first drive was found,
@@ -713,7 +707,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