summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorAaron Lu <Aaron.Lu@amd.com>2011-07-11 13:27:11 +0800
committerChris Ball <cjb@laptop.org>2011-08-13 14:50:19 -0400
commit78869618a886d33d8cdfcb78cf9b245b5250e465 (patch)
tree97523732214d8529a62ec2bcbc9c54703767754f /drivers/mmc
parent322a8b034003c0d46d39af85bf24fee27b902f48 (diff)
downloadlinux-3.10-78869618a886d33d8cdfcb78cf9b245b5250e465.tar.gz
linux-3.10-78869618a886d33d8cdfcb78cf9b245b5250e465.tar.bz2
linux-3.10-78869618a886d33d8cdfcb78cf9b245b5250e465.zip
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>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index c31a3343340..262985a1a95 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;
/*