From 62b7f880e85fe7936ab6dd04823d481dd524e761 Mon Sep 17 00:00:00 2001
From: Alex Dubov <oakad@yahoo.com>
Date: Mon, 10 Mar 2008 11:43:38 -0700
Subject: [PATCH] --- yaml --- r: 87077 b: refs/heads/master c:
 29196dc67e1b76ce84e25228783f6b8a3c48e9dd h: refs/heads/master i:   87075:
 016c7fc8b70db68dfc8f375477e538f9bc43f7f0 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/memstick/core/memstick.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 54094574354e..9623176db3ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d114ad54ffb020dc781b6159c1c2f391c6ec418f
+refs/heads/master: 29196dc67e1b76ce84e25228783f6b8a3c48e9dd
diff --git a/trunk/drivers/memstick/core/memstick.c b/trunk/drivers/memstick/core/memstick.c
index 3c97bac4e47b..decd6a49fd5a 100644
--- a/trunk/drivers/memstick/core/memstick.c
+++ b/trunk/drivers/memstick/core/memstick.c
@@ -236,7 +236,7 @@ int memstick_next_req(struct memstick_host *host, struct memstick_request **mrq)
 		rc = host->card->next_request(host->card, mrq);
 
 	if (!rc)
-		host->retries = cmd_retries;
+		host->retries = cmd_retries > 1 ? cmd_retries - 1 : 1;
 	else
 		*mrq = NULL;