Commit fd674198 authored Apr 03, 2015 by Doug Anderson Committed by Ulf Hansson Apr 09, 2015

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: 5c935165 ("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>

parent 8886a6fd

drivers/mmc/host/dw_mmc.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -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);