diff options
| author |   Douglas Anderson <dianders@chromium.org> | 2017-10-12 13:11:14 -0700 |
|---|---|---|
| committer |   Ulf Hansson <ulf.hansson@linaro.org> | 2017-10-30 12:14:52 +0100 |
| commit | 0363b12d3311eaf1355d4b9272a51dd852ea2fc1 (patch) | |
| tree | 78e101e6d1ee335f0feb78ed4eaa375a57672e94 /drivers | |
| parent | mmc: renesas_sdhi: fix kernel panic in _internal_dmac.c (diff) | |
| download | linux-dev-0363b12d3311eaf1355d4b9272a51dd852ea2fc1.tar.xz linux-dev-0363b12d3311eaf1355d4b9272a51dd852ea2fc1.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/dw_mmc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 860313bd952a..f5b2bb4b4d98 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2570,6 +2570,8 @@ done: static void dw_mci_cmd_interrupt(struct dw_mci *host, u32 status) { + del_timer(&host->cto_timer); + if (!host->cmd_status) host->cmd_status = status; @@ -2662,7 +2664,6 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id) } if (pending & SDMMC_INT_CMD_DONE) { - del_timer(&host->cto_timer); mci_writel(host, RINTSTS, SDMMC_INT_CMD_DONE); dw_mci_cmd_interrupt(host, pending); } |