aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/sh_mmcif.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2012-12-12 15:38:15 +0100
committerChris Ball <cjb@laptop.org>2013-02-11 13:28:31 -0500
commitaba9d646785c8b1decb1a15ee157b0179a15bef9 (patch)
treeb742cb20485884710d39730328ee9e921b1d7a8c /drivers/mmc/host/sh_mmcif.c
parentmmc: sh_mmcif: fix a race, causing an Oops on SMP (diff)
downloadlinux-dev-aba9d646785c8b1decb1a15ee157b0179a15bef9.tar.xz
linux-dev-aba9d646785c8b1decb1a15ee157b0179a15bef9.zip
mmc: sh_mmcif: reset error code for any opcode
If a command execution has produced an error, it has to be reset as a part of the error handling. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to '')
-rw-r--r--drivers/mmc/host/sh_mmcif.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 3cfe383dc22b..14fafafc12d3 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/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)) {