From 4db5f53e04992dd1a57bf67dd0af58727cb0f60c Mon Sep 17 00:00:00 2001 From: Jorg Schummer Date: Thu, 19 Feb 2009 13:17:03 +0200 Subject: [PATCH] --- yaml --- r: 140458 b: refs/heads/master c: 7de427d088a967d2173739e21e744921d5496a8b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mmc/core/core.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5db620068c95..545890166953 100644 --- 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 index df6ce4a06cf3..b5899e33b687 100644 --- 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);