releases/4.16.4/mmc-tmio-fix-error-handling-when-issuing-cmd23.patch

   1 From fc167daff581c01ebce8695e9618231cae3561a1 Mon Sep 17 00:00:00 2001
   2 From: Masaharu Hayakawa <masaharu.hayakawa.ry@renesas.com>
   3 Date: Tue, 3 Apr 2018 23:57:03 +0200
   4 Subject: mmc: tmio: Fix error handling when issuing CMD23
   5
   6 From: Masaharu Hayakawa <masaharu.hayakawa.ry@renesas.com>
   7
   8 commit fc167daff581c01ebce8695e9618231cae3561a1 upstream.
   9
  10 If an error was detected when CMD23 was issued, command sequence should
  11 be terminated with errors and CMD23 should be issued after retuning.
  12
  13 Fixes: 8b22c3c18be5 ("mmc: tmio: add CMD23 support")
  14 Signed-off-by: Masaharu Hayakawa <masaharu.hayakawa.ry@renesas.com>
  15 Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
  16 Cc: <stable@vger.kernel.org> # 4.13+
  17 Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  19
  20 ---
  21  drivers/mmc/host/tmio_mmc_core.c |    2 +-
  22  1 file changed, 1 insertion(+), 1 deletion(-)
  23
  24 --- a/drivers/mmc/host/tmio_mmc_core.c
  25 +++ b/drivers/mmc/host/tmio_mmc_core.c
  26 @@ -911,7 +911,7 @@ static void tmio_mmc_finish_request(stru
  27                 host->check_scc_error(host);
  28
  29         /* If SET_BLOCK_COUNT, continue with main command */
  30 -       if (host->mrq) {
  31 +       if (host->mrq && !mrq->cmd->error) {
  32                 tmio_process_mrq(host, mrq);
  33                 return;
  34         }