Commit c6ced0db authored Dec 28, 2011 by Aaron Lu Committed by Chris Ball Jan 12, 2012

mmc: sdhci: Fix tuning timer incorrect setting when suspending host



When suspending host, the tuning timer shoule be deactivated.
And the HOST_NEEDS_TUNING flag should be set after tuning timer is
deactivated.

Signed-off-by: Philip Rakity <prakity@marvell.com>
Signed-off-by: Aaron Lu <aaron.lu@amd.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

parent aa9df4fb

drivers/mmc/host/sdhci.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -2356,9 +2356,8 @@ int sdhci_suspend_host(struct sdhci_host *host)
		/* Disable tuning since we are suspending */
		if (host->version >= SDHCI_SPEC_300 && host->tuning_count &&
		host->tuning_mode == SDHCI_TUNING_MODE_1) {
		del_timer_sync(&host->tuning_timer);
		host->flags &= ~SDHCI_NEEDS_RETUNING;
		mod_timer(&host->tuning_timer, jiffies +
		host->tuning_count * HZ);
		}

		ret = mmc_suspend_host(host->mmc);