From 9b9ec8d758124f86e98a035dc036bfaeeaa34b12 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Thu, 29 Jan 2009 20:31:35 +0900
Subject: [PATCH] --- yaml --- r: 130816 b: refs/heads/master c:
 cf9a590a9eae3b99ca77d8db17afd2d7dbdd0986 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 65d61dcaed5e..d152118398e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2c7a89c5eabaea8c0c2aa0c1069e510144513ab
+refs/heads/master: cf9a590a9eae3b99ca77d8db17afd2d7dbdd0986
diff --git a/trunk/drivers/ata/libata-eh.c b/trunk/drivers/ata/libata-eh.c
index caa1e9fde3c9..ce2ef0475339 100644
--- a/trunk/drivers/ata/libata-eh.c
+++ b/trunk/drivers/ata/libata-eh.c
@@ -3035,7 +3035,11 @@ static int ata_eh_handle_dev_fail(struct ata_device *dev, int err)
 {
 	struct ata_eh_context *ehc = &dev->link->eh_context;
 
-	ehc->tries[dev->devno]--;
+	/* -EAGAIN from EH routine indicates retry without prejudice.
+	 * The requester is responsible for ensuring forward progress.
+	 */
+	if (err != -EAGAIN)
+		ehc->tries[dev->devno]--;
 
 	switch (err) {
 	case -ENODEV: