---

yaml --- r: 140458 b: refs/heads/master c: 7de427d h: refs/heads/master v: v3
git-mirror · Mar 24, 2009 · 4db5f53 · 4db5f53
1 parent 3f901b1
commit 4db5f53
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89c8aa203e71f05afdc978700cbc767d310e3d70
+refs/heads/master: 7de427d088a967d2173739e21e744921d5496a8b
diff --git a/trunk/drivers/mmc/core/core.c b/trunk/drivers/mmc/core/core.c
@@ -815,6 +815,7 @@ void mmc_stop_host(struct mmc_host *host)
 	spin_unlock_irqrestore(&host->lock, flags);
 #endif
 
+	cancel_delayed_work(&host->detect);
 	mmc_flush_scheduled_work();
 
 	mmc_bus_get(host);
@@ -842,6 +843,7 @@ void mmc_stop_host(struct mmc_host *host)
  */
 int mmc_suspend_host(struct mmc_host *host, pm_message_t state)
 {
+	cancel_delayed_work(&host->detect);
 	mmc_flush_scheduled_work();
 
 	mmc_bus_get(host);