diff options
| author | Doug Anderson <dianders@chromium.org> | 2015-04-03 20:13:06 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2015-04-09 09:08:27 +0200 |
| commit | fd6741983386a7ec1c707a4c93e7a26e383cc571 (patch) | |
| tree | 9b05d62eaad7beb9420385b3e55535629760bda0 /drivers/mmc | |
| parent | mmc: dw_mmc: Increase cmd11 timeout to 500ms (diff) | |
| download | linux-fd6741983386a7ec1c707a4c93e7a26e383cc571.tar.xz linux-fd6741983386a7ec1c707a4c93e7a26e383cc571.zip | |
mmc: dw_mmc: Add a return in an unexpected cmd11 timeout
If we get an unexpected cmd11 timeout we shouldn't actually treat it
as a timeout (not that we really expect to get an unexpected cmd11
timeout, but still).
Fixes: 5c935165da79 ("mmc: dw_mmc: Add a timeout for sending CMD11")
Reported-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/dw_mmc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index b613845396a1..c2b568352ce3 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2579,8 +2579,10 @@ static void dw_mci_cmd11_timer(unsigned long arg) { struct dw_mci *host = (struct dw_mci *)arg; - if (host->state != STATE_SENDING_CMD11) - dev_info(host->dev, "Unexpected CMD11 timeout\n"); + if (host->state != STATE_SENDING_CMD11) { + dev_warn(host->dev, "Unexpected CMD11 timeout\n"); + return; + } host->cmd_status = SDMMC_INT_RTO; set_bit(EVENT_CMD_COMPLETE, &host->pending_events); |