summaryrefslogtreecommitdiff
path: root/drivers/ata
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-05-23 11:58:52 +0200
committerJeff Garzik <jeff@garzik.org>2007-05-24 20:34:48 -0400
commit6dffaf61e22d21e539ae7e30c2e33e41230c3d52 (patch)
tree35a74b89240675bbef7fcc825ece5e5ad29d1d62 /drivers/ata
parentfd7fe701612e42fb8780d7bf61fbb0467a488c9b (diff)
downloadlinux-stable-6dffaf61e22d21e539ae7e30c2e33e41230c3d52.tar.gz
linux-stable-6dffaf61e22d21e539ae7e30c2e33e41230c3d52.tar.bz2
linux-stable-6dffaf61e22d21e539ae7e30c2e33e41230c3d52.zip
libata: -ENODEV during prereset isn't an error
During prereset, -ENODEV return from ata_wait_ready() is not an error. This causes unnecessary bug message on controllers which uses 0xff to indicate empty port. Fix it. Signed-off-by: Tejun Heo <htejun@gmail.com> Cc: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libata-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 5788a9dd0445..3ca9c610c110 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -3368,7 +3368,7 @@ int ata_std_prereset(struct ata_port *ap, unsigned long deadline)
*/
if (!(ap->flags & ATA_FLAG_SKIP_D2H_BSY) && !ata_port_offline(ap)) {
rc = ata_wait_ready(ap, deadline);
- if (rc) {
+ if (rc && rc != -ENODEV) {
ata_port_printk(ap, KERN_WARNING, "device not ready "
"(errno=%d), forcing hardreset\n", rc);
ehc->i.action |= ATA_EH_HARDRESET;