mmc: dw_mmc: cancel the CTO timer after a voltage switch
authorDouglas Anderson <dianders@chromium.org>
Thu, 12 Oct 2017 20:11:14 +0000 (13:11 -0700)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 30 Oct 2017 11:14:52 +0000 (12:14 +0100)
commit0363b12d3311eaf1355d4b9272a51dd852ea2fc1
tree78e101e6d1ee335f0feb78ed4eaa375a57672e94
parent48e1dc10a9440872c0fc07a7fbcfce177f996fd4
mmc: dw_mmc: cancel the CTO timer after a voltage switch

When running with the commit 03de19212ea3 ("mmc: dw_mmc: introduce
timer for broken command transfer over scheme") I found this message
in the log:
  Unexpected command timeout, state 7

It turns out that we weren't properly cancelling the new CTO timer in
the case that a voltage switch was done.  Let's promote the cancel
into the dw_mci_cmd_interrupt() function to fix this.

Fixes: 03de19212ea3 ("mmc: dw_mmc: introduce timer for broken command transfer over scheme")
Tested-by: Emil Renner Berthing <kernel@esmil.dk>
Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/dw_mmc.c