aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyo Kataoka <ryo.kataoka.wt@renesas.com>2019-07-11 21:17:09 +0900
committerRyo Kataoka <ryo.kataoka.wt@renesas.com>2019-07-11 21:17:09 +0900
commit4498fec78778c999f9f0fb51085353541c1c0804 (patch)
treeaa41812c72d784f5d43959fbf00f2c9944530c02
parentbf95bdcff0583d769cbb9e25fdba4664c20396de (diff)
parentad38f53513fa668f560d03d9486116cb7db965c4 (diff)
downloadrenesas-bsp-4498fec78778c999f9f0fb51085353541c1c0804.tar.gz
Merge branch 'rcar-3.9.4/sd_mmc.rc4' into v4.14.75-ltsi/rcar-3.9.6
* rcar-3.9.4/sd_mmc.rc4: mmc: tmio: fix SCC error handling to avoid false positive CRC error
-rw-r--r--drivers/mmc/host/tmio_mmc_core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
index 0e7ac27b4809e..2dea8ded55daf 100644
--- a/drivers/mmc/host/tmio_mmc_core.c
+++ b/drivers/mmc/host/tmio_mmc_core.c
@@ -1044,8 +1044,9 @@ static void tmio_mmc_finish_request(struct tmio_mmc_host *host)
tmio_mmc_abort_dma(host);
}
+ /* SCC error means retune, but executed command was still successful */
if (host->check_scc_error && host->check_scc_error(host))
- mrq->cmd->error = -EILSEQ;
+ mmc_retune_needed(host->mmc);
/* If SET_BLOCK_COUNT, continue with main command */
if (host->mrq && !mrq->cmd->error) {