summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasaharu Hayakawa <masaharu.hayakawa.ry@renesas.com>2018-04-03 23:57:03 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2018-04-04 12:21:27 +0200
commitfc167daff581c01ebce8695e9618231cae3561a1 (patch)
tree090cac202dedfca0e86ccf329780b88b375bb7be
parentd0a0852b9f81cf5f793bf2eae7336ed40a1a1815 (diff)
downloadlinux-fc167daff581c01ebce8695e9618231cae3561a1.tar.gz
linux-fc167daff581c01ebce8695e9618231cae3561a1.tar.bz2
linux-fc167daff581c01ebce8695e9618231cae3561a1.zip
mmc: tmio: Fix error handling when issuing CMD23
If an error was detected when CMD23 was issued, command sequence should be terminated with errors and CMD23 should be issued after retuning. Fixes: 8b22c3c18be5 ("mmc: tmio: add CMD23 support") Signed-off-by: Masaharu Hayakawa <masaharu.hayakawa.ry@renesas.com> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Cc: <stable@vger.kernel.org> # 4.13+ Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/host/tmio_mmc_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
index e30df9ad8197..308029930304 100644
--- a/drivers/mmc/host/tmio_mmc_core.c
+++ b/drivers/mmc/host/tmio_mmc_core.c
@@ -913,7 +913,7 @@ static void tmio_mmc_finish_request(struct tmio_mmc_host *host)
host->check_scc_error(host);
/* If SET_BLOCK_COUNT, continue with main command */
- if (host->mrq) {
+ if (host->mrq && !mrq->cmd->error) {
tmio_process_mrq(host, mrq);
return;
}