diff options
| author | Ryo Kataoka <ryo.kataoka.wt@renesas.com> | 2019-05-10 14:25:44 +0900 |
|---|---|---|
| committer | Ryo Kataoka <ryo.kataoka.wt@renesas.com> | 2019-05-10 14:25:44 +0900 |
| commit | 5b07127d625f0da43538f4eab07f290c474b4c35 (patch) | |
| tree | f64bdaa7a95cc8a548f72f994d47d6d3309c50cd | |
| parent | d851d62ff08e987aa53597b3e48c1fe874a34f24 (diff) | |
| parent | 98ca1f882669dc7d6019319d045766bc2f6e16eb (diff) | |
| download | renesas-bsp-v4.14.75-ltsi/rcar-3.9.5.rc1.tar.gz | |
Merge branch 'rcar-3.9.4/sd_mmc.rc1' into v4.14.75-ltsi/rcar-3.9.5rcar-3.9.5.rc1v4.14.75-ltsi/rcar-3.9.5.rc1
* rcar-3.9.4/sd_mmc.rc1:
[HOTFIX] mmc: tmio: fix scc error handling to avoid CRC error message
| -rw-r--r-- | drivers/mmc/host/tmio_mmc_core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index 0e7ac27b4809e6..6ca43d511d5e9a 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -1044,8 +1044,10 @@ static void tmio_mmc_finish_request(struct tmio_mmc_host *host) tmio_mmc_abort_dma(host); } - if (host->check_scc_error && host->check_scc_error(host)) - mrq->cmd->error = -EILSEQ; + if (host->check_scc_error && host->check_scc_error(host)) { + /* re-tuning runs before next request */ + mmc_retune_needed(host->mmc); + } /* If SET_BLOCK_COUNT, continue with main command */ if (host->mrq && !mrq->cmd->error) { |