| From 9f9332849206fcd4dc100f4763640c6ed3df8708 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 30 Aug 2018 01:32:07 +0200 |
| Subject: mmc: tmio: Fix SCC error detection |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Masaharu Hayakawa <masaharu.hayakawa.ry@renesas.com> |
| |
| [ Upstream commit b85fb0a1c8aeaaa40d08945d51a6656b512173f0 ] |
| |
| SDR104, HS200 and HS400 need to check for SCC error. If SCC error is |
| detected, retuning is necessary. |
| |
| Signed-off-by: Masaharu Hayakawa <masaharu.hayakawa.ry@renesas.com> |
| [Niklas: update commit message] |
| Signed-off-by: Niklas Sรถderlund <niklas.soderlund+renesas@ragnatech.se> |
| Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/mmc/host/tmio_mmc_core.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c |
| index 2437fcde915a7..01e51b7945750 100644 |
| --- a/drivers/mmc/host/tmio_mmc_core.c |
| +++ b/drivers/mmc/host/tmio_mmc_core.c |
| @@ -914,8 +914,8 @@ static void tmio_mmc_finish_request(struct tmio_mmc_host *host) |
| if (mrq->cmd->error || (mrq->data && mrq->data->error)) |
| tmio_mmc_abort_dma(host); |
| |
| - if (host->check_scc_error) |
| - host->check_scc_error(host); |
| + if (host->check_scc_error && host->check_scc_error(host)) |
| + mrq->cmd->error = -EILSEQ; |
| |
| /* If SET_BLOCK_COUNT, continue with main command */ |
| if (host->mrq && !mrq->cmd->error) { |
| -- |
| 2.20.1 |
| |
