Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 189144
b: refs/heads/master
c: 9ce41ae
h: refs/heads/master
v: v3
  • Loading branch information
David S. Miller committed Mar 29, 2010
1 parent f68166f commit 2034c25
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e4afb29fa3ea759d408fa537ab6a81800708396e
refs/heads/master: 9ce41aed0d392246eb788786253f242e829fd5e1
12 changes: 3 additions & 9 deletions trunk/drivers/ide/ide-probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down

0 comments on commit 2034c25

Please sign in to comment.