diff options
| author |   Jorg Schummer <ext-jorg.2.schummer@nokia.com> | 2009-02-19 13:17:03 +0200 |
|---|---|---|
| committer |   Pierre Ossman <drzeus@drzeus.cx> | 2009-03-24 21:29:58 +0100 |
| commit | 7de427d088a967d2173739e21e744921d5496a8b (patch) | |
| tree | 6b4476bdcd796dc5cf66f21a9f00fc22b329becb /drivers/mmc | |
| parent | mmc: struct device - replace bus_id with dev_name(), dev_set_name() (diff) | |
| download | linux-dev-7de427d088a967d2173739e21e744921d5496a8b.tar.xz linux-dev-7de427d088a967d2173739e21e744921d5496a8b.zip | |
mmc: delayed_work was never cancelled
The delayed work item mmc_host.detect is now cancelled before flushing
the work queue. This takes care of cases when delayed_work was scheduled
for mmc_host.detect, but not yet placed in the work queue.
Signed-off-by: Jorg Schummer <ext-jorg.2.schummer@nokia.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/core/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index df6ce4a06cf3..b5899e33b687 100644 --- a/drivers/mmc/core/core.c +++ b/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); |