diff options
| author | Aaron Lu <aaron.lu@amd.com> | 2011-12-28 11:11:12 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-25 16:13:27 -0800 |
| commit | 5b39b6d126f7133b98e5655e5aedfb87b3e5366c (patch) | |
| tree | dc5ee6aeecf6ede389c81faaee2d003af5baa98f /drivers/mmc | |
| parent | 4ed074c646b78c81a5b1b939b8a35c5b7004be00 (diff) | |
| download | kernel_samsung_smdk4412-5b39b6d126f7133b98e5655e5aedfb87b3e5366c.zip kernel_samsung_smdk4412-5b39b6d126f7133b98e5655e5aedfb87b3e5366c.tar.gz kernel_samsung_smdk4412-5b39b6d126f7133b98e5655e5aedfb87b3e5366c.tar.bz2 | |
mmc: sdhci: Fix tuning timer incorrect setting when suspending host
commit c6ced0db08010ed75df221a2946c5228454b38d5 upstream.
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>
Signed-off-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 19ed580..9279c1b 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2336,9 +2336,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); |