diff options
| author | Aaron Lu <Aaron.Lu@amd.com> | 2011-07-11 13:27:11 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-29 13:29:16 -0700 |
| commit | 3a60f9e4a0fb6db169781eb5ee78e1ecbe4195f5 (patch) | |
| tree | 1ea1e2d77931f01055b101c72eb32d189805496f | |
| parent | 5af075e3d112a6d9c2fa53c1b99a5ee945e649fd (diff) | |
mmc: sdhci: fix retuning timer wrongly deleted in sdhci_tasklet_finish
commit 78869618a886d33d8cdfcb78cf9b245b5250e465 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 58d5436ff649..6d3de0888e74 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1863,9 +1863,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; /* |