diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-24 15:04:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-24 15:04:03 -0700 |
| commit | 71260272c6d27e6dd2f37c1df0916024ca81e9d6 (patch) | |
| tree | 44d265faf77438817cf15c25f71875e79d593cd4 | |
| parent | 067fbafbd0bb80a4576599883ea378cfe9807326 (diff) | |
| download | stable-queue-71260272c6d27e6dd2f37c1df0916024ca81e9d6.tar.gz | |
3.0 patches
| -rw-r--r-- | queue-3.0/mmc-sdhci-fix-retuning-timer-wrongly-deleted-in.patch | 35 | ||||
| -rw-r--r-- | queue-3.0/series | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/queue-3.0/mmc-sdhci-fix-retuning-timer-wrongly-deleted-in.patch b/queue-3.0/mmc-sdhci-fix-retuning-timer-wrongly-deleted-in.patch new file mode 100644 index 0000000000..a63e56110b --- /dev/null +++ b/queue-3.0/mmc-sdhci-fix-retuning-timer-wrongly-deleted-in.patch @@ -0,0 +1,35 @@ +From 78869618a886d33d8cdfcb78cf9b245b5250e465 Mon Sep 17 00:00:00 2001 +From: Aaron Lu <Aaron.Lu@amd.com> +Date: Mon, 11 Jul 2011 13:27:11 +0800 +Subject: mmc: sdhci: fix retuning timer wrongly deleted in + sdhci_tasklet_finish + +From: Aaron Lu <Aaron.Lu@amd.com> + +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> + +--- + drivers/mmc/host/sdhci.c | 3 --- + 1 file changed, 3 deletions(-) + +--- a/drivers/mmc/host/sdhci.c ++++ b/drivers/mmc/host/sdhci.c +@@ -1863,9 +1863,6 @@ static void sdhci_tasklet_finish(unsigne + + del_timer(&host->timer); + +- if (host->version >= SDHCI_SPEC_300) +- del_timer(&host->tuning_timer); +- + mrq = host->mrq; + + /* diff --git a/queue-3.0/series b/queue-3.0/series index cd5c1cfbdd..de8da3195d 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -30,3 +30,4 @@ drm-ttm-fix-ttm_bo_add_ttm-user-failure-path.patch drm-radeon-extended-ddc-probing-for-toshiba-l300d-radeon.patch fuse-check-size-of-fuse_notify_inval_entry-message.patch rt2x00-fix-order-of-entry-flags-modification.patch +mmc-sdhci-fix-retuning-timer-wrongly-deleted-in.patch |