mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 22:38:04 +00:00
Koen Kooi
189ce92b4c
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From 5fda16f987c13e470fd4a4ae87dd3ed6b4f5be46 Mon Sep 17 00:00:00 2001
|
|
From: Aaron Lu <aaron.lu@amd.com>
|
|
Date: Wed, 28 Dec 2011 11:11:12 +0800
|
|
Subject: [PATCH 059/129] 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>
|
|
---
|
|
drivers/mmc/host/sdhci.c | 3 +--
|
|
1 file changed, 1 insertion(+), 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);
|
|
--
|
|
1.7.9.5
|
|
|