Re: [PATCH] mmc: tmio: Fix error handling when issuing CMD23

2018-04-04 Thread Ulf Hansson
On 3 April 2018 at 23:57, Wolfram Sang  wrote:
> From: Masaharu Hayakawa 
>
> 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 
> Signed-off-by: Wolfram Sang 

Applied for fixes, thanks!

Kind regards
Uffe

> ---
>
> Ulf: I'd think this is suitable for stable...
>
>  drivers/mmc/host/tmio_mmc_core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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;
> }
> --
> 2.11.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] mmc: tmio: Fix error handling when issuing CMD23

2018-04-03 Thread Wolfram Sang
From: Masaharu Hayakawa 

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 
Signed-off-by: Wolfram Sang 
---

Ulf: I'd think this is suitable for stable...

 drivers/mmc/host/tmio_mmc_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
}
-- 
2.11.0