3.0 patches

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 (file)
index 0000000..a63e561
--- /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 cd5c1cfbdd6b2743d331bd26175a6c126e8c113e..de8da3195da5695c31ea8890ed1a42ccf26f75f0 100644 (file)
--- 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