From 273380e0941614b06681d53d0a2fc60d855bd980 Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Mon, 12 Jun 2006 14:11:01 +0900
Subject: [PATCH] --- yaml --- r: 29517 b: refs/heads/master c:
 f9be7113b56eb5d013a611d9c65e8d1d2d3f7c94 h: refs/heads/master i:   29515:
 d6c52d2275736b1c430d07af94e82dc6b76a507d v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/scsi/libata-eh.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index da8416bac1f4..ad3fe8f6549d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 551e8889509c30cda31e464e5cbe7572c4e1febd
+refs/heads/master: f9be7113b56eb5d013a611d9c65e8d1d2d3f7c94
diff --git a/trunk/drivers/scsi/libata-eh.c b/trunk/drivers/scsi/libata-eh.c
index f82799e22588..782dfba573a9 100644
--- a/trunk/drivers/scsi/libata-eh.c
+++ b/trunk/drivers/scsi/libata-eh.c
@@ -1556,8 +1556,6 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap,
 
 			/* schedule the scsi_rescan_device() here */
 			queue_work(ata_aux_wq, &(ap->scsi_rescan_task));
-
-			ehc->i.action &= ~ATA_EH_REVALIDATE;
 		} else if (dev->class == ATA_DEV_UNKNOWN &&
 			   ehc->tries[dev->devno] &&
 			   ata_class_enabled(ehc->classes[dev->devno])) {
@@ -1578,7 +1576,9 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap,
 		}
 	}
 
-	if (rc)
+	if (rc == 0)
+		ehc->i.action &= ~ATA_EH_REVALIDATE;
+	else
 		*r_failed_dev = dev;
 
 	DPRINTK("EXIT\n");