From bed9f5ebedcc1a11f3a0c5a0716e84d67bbff447 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Wed, 12 Dec 2012 15:38:15 +0100
Subject: [PATCH] --- yaml --- r: 359883 b: refs/heads/master c:
 33e69c7b4821818fb758c5437a7bc50d06f37dde h: refs/heads/master i:   359881:
 e70684aefeadcc460564d0e7bd86ac9f624c93a7   359879:
 7c9900196aa9d5df39a559bb8074082da54a2362 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/mmc/host/sh_mmcif.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 30f0304335f4..eb33185cea90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f20bec813edbef479bfc771abd037fc92e1ddf02
+refs/heads/master: 33e69c7b4821818fb758c5437a7bc50d06f37dde
diff --git a/trunk/drivers/mmc/host/sh_mmcif.c b/trunk/drivers/mmc/host/sh_mmcif.c
index 3cfe383dc22b..14fafafc12d3 100644
--- a/trunk/drivers/mmc/host/sh_mmcif.c
+++ b/trunk/drivers/mmc/host/sh_mmcif.c
@@ -1041,7 +1041,6 @@ static bool sh_mmcif_end_cmd(struct sh_mmcif_host *host)
 		case MMC_SELECT_CARD:
 		case MMC_APP_CMD:
 			cmd->error = -ETIMEDOUT;
-			host->sd_error = false;
 			break;
 		default:
 			cmd->error = sh_mmcif_error_manage(host);
@@ -1049,6 +1048,7 @@ static bool sh_mmcif_end_cmd(struct sh_mmcif_host *host)
 				cmd->opcode, cmd->error);
 			break;
 		}
+		host->sd_error = false;
 		return false;
 	}
 	if (!(cmd->flags & MMC_RSP_PRESENT)) {