aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUli Luckas <u.luckas@road-gmbh.de>2005-11-07 16:22:07 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-11-07 16:22:07 -0500
commit896937ad5c8a1f7264b43b79c0bac2bd8d993ece (patch)
tree0ef8a66fd172980f01dcf6bd08b293cd931d7e8b
parent0b154bb7d0cce80e9c0bcf11d4f9e71b59409d26 (diff)
[ARM] 3120/1: Fix MMC/SD card driver resume deadlock
Patch from Uli Luckas This is a simplification of patch 3116/1 as sugested by Russell King. Signed-off-by: Uli Luckas <u.luckas@road-gmbh.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/mmc/mmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index ceae379a4d4c..da528390acf8 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -1263,7 +1263,7 @@ EXPORT_SYMBOL(mmc_suspend_host);
1263 */ 1263 */
1264int mmc_resume_host(struct mmc_host *host) 1264int mmc_resume_host(struct mmc_host *host)
1265{ 1265{
1266 mmc_detect_change(host, 0); 1266 mmc_rescan(host);
1267 1267
1268 return 0; 1268 return 0;
1269} 1269}