Commit 07c161bc authored Jun 29, 2016 by Adrian Hunter Committed by Ulf Hansson Jul 25, 2016

mmc: sdhci: sdhci_execute_tuning() must delete timer



sdhci_send_command() starts a timer to catch cases where the host
controller fails. The timer is normally deleted when the request completes,
but in the case of sdhci_execute_tuning() the request is handled
differently and the timer is left running. This goes unnoticed because
tuning is done before another command so the timer gets reset then.
That should not be relied upon, so make sdhci_execute_tuning() delete the
timer.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 8842fd17

drivers/mmc/host/sdhci.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2057,6 +2057,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
		sdhci_send_command(host, &cmd);

		host->cmd = NULL;
		sdhci_del_timer(host, &mrq);

		spin_unlock_irqrestore(&host->lock, flags);
		/* Wait for Buffer Read Ready interrupt */

Admin message