diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-29 03:58:28 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-29 03:58:28 +0200 |
| commit | 9ce41aed0d392246eb788786253f242e829fd5e1 (patch) | |
| tree | 1d6c9f820becf2fedec4d768bbb4a83dda235b72 /drivers/ide/ide-probe.c | |
| parent | Revert "via82cxxx: workaround h/w bugs" (diff) | |
| download | linux-9ce41aed0d392246eb788786253f242e829fd5e1.tar.xz linux-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>
Diffstat (limited to 'drivers/ide/ide-probe.c')
| -rw-r--r-- | drivers/ide/ide-probe.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index fbedd35feb44..4c3d1bfec0c5 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 |