From: Masaharu Hayakawa <masaharu.hayakawa.ry@renesas.com>
Date: Tue, 3 Apr 2018 21:57:03 +0000 (+0200)
Subject: mmc: tmio: Fix error handling when issuing CMD23
X-Git-Tag: v5.15~8979^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc167daff581c01ebce8695e9618231cae3561a1;p=platform%2Fkernel%2Flinux-starfive.git

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>
---

diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
index e30df9a..3080299 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;
 	}