From 13664205a8770db7f60ad4daa8af27471d3299d0 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Wed, 23 May 2007 11:58:52 +0200 Subject: [PATCH] --- yaml --- r: 56966 b: refs/heads/master c: 6dffaf61e22d21e539ae7e30c2e33e41230c3d52 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d4e9b98e1a24..593130f2a084 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd7fe701612e42fb8780d7bf61fbb0467a488c9b +refs/heads/master: 6dffaf61e22d21e539ae7e30c2e33e41230c3d52 diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index 5788a9dd0445..3ca9c610c110 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/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;