From: Aaron Lu <Aaron.Lu@amd.com>
Date: Mon, 11 Jul 2011 05:27:11 +0000 (+0800)
Subject: mmc: sdhci: fix retuning timer wrongly deleted in sdhci_tasklet_finish
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=78869618a886d33d8cdfcb78cf9b245b5250e465;p=linux.git

mmc: sdhci: fix retuning timer wrongly deleted in sdhci_tasklet_finish

Currently, the retuning timer for retuning mode 1 will be deleted in
function sdhci_tasklet_finish after a mmc request done, which will make
retuning timing never trigger again. This patch fixed this problem.

Signed-off-by: Aaron Lu <Aaron.Lu@amd.com>
Reviewed-by: Philip Rakity <prakity@marvell.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
---

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index c31a3343340d3..262985a1a9527 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1867,9 +1867,6 @@ static void sdhci_tasklet_finish(unsigned long param)
 
 	del_timer(&host->timer);
 
-	if (host->version >= SDHCI_SPEC_300)
-		del_timer(&host->tuning_timer);
-
 	mrq = host->mrq;
 
 	/*