From e5c3c2712dc67565ea61658b8ec03345ae1a0448 Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Wed, 30 Mar 2005 15:05:45 -0500
Subject: [PATCH] --- yaml --- r: 7743 b: refs/heads/master c:
 e47373ec1c9aab9ee134f4e2b8249957e9f4c7ef h: refs/heads/master i:   7741:
 77ab1a89ef368a9e43c6ca064e0882956c9afb1e   7739:
 ac52b3af90498e39beb179280462513de83d9eb0   7735:
 9a94f04197b2136f4dd04230a344f4ad6aa09187   7727:
 5585c66203084f9273f070c4063fb4ffd3459583   7711:
 f696870b7af22051e91afbd7d41892c099bcde03   7679:
 424844c1e82156731a79ffe6ba75559d7b56d0cf v: v3

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

diff --git a/[refs] b/[refs]
index d04736f89db3..1d3b90cc5dd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dddbc26c3895ecdab1f4b16435685b47f96f599
+refs/heads/master: e47373ec1c9aab9ee134f4e2b8249957e9f4c7ef
diff --git a/trunk/drivers/scsi/scsi_error.c b/trunk/drivers/scsi/scsi_error.c
index e9c451ba71fc..688bce740786 100644
--- a/trunk/drivers/scsi/scsi_error.c
+++ b/trunk/drivers/scsi/scsi_error.c
@@ -776,9 +776,11 @@ static int scsi_eh_tur(struct scsi_cmnd *scmd)
 		__FUNCTION__, scmd, rtn));
 	if (rtn == SUCCESS)
 		return 0;
-	else if (rtn == NEEDS_RETRY)
+	else if (rtn == NEEDS_RETRY) {
 		if (retry_cnt--)
 			goto retry_tur;
+		return 0;
+	}
 	return 1;
 }