From: Aaron Lu Date: Mon, 11 Jul 2011 05:27:11 +0000 (+0800) Subject: mmc: sdhci: fix retuning timer wrongly deleted in sdhci_tasklet_finish X-Git-Tag: v3.0.4~3 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3a60f9e4a0fb6db169781eb5ee78e1ecbe4195f5;p=karo-tx-linux.git 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 Reviewed-by: Philip Rakity Signed-off-by: Chris Ball Signed-off-by: Greg Kroah-Hartman --- 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; /*