MMC: core/core.c: fixed: delayed_work was never cancelled
PATCH 1/1 MMC: core/core.c: fixed: 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.
--- drivers/mmc/core/core.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
drivers/mmc/core/core.c +4 -3
@@ -57,8 +57,9 @@ static int mmc_schedule_delayed_work(struct delayed_work *work,/* * Internal function. Flush all scheduled work from the MMC work queue. */ -static void mmc_flush_scheduled_work (void ) +static void mmc_flush_scheduled_work (struct mmc_host *host) { +cancel_delayed_work (&host->detect);flush_workqueue (workqueue); }
@@ -738,7 +739,7 @@ void mmc_stop_host(struct mmc_host *host)spin_unlock_irqrestore (&host->lock, flags);#endif -mmc_flush_scheduled_work (); +mmc_flush_scheduled_work (host);mmc_bus_get (host);if (host->bus_ops && !host->bus_dead) {
@@ -765,7 +766,7 @@ void mmc_stop_host(struct mmc_host *host)*/ int mmc_suspend_host (struct mmc_host *host,pm_message_t state) { -mmc_flush_scheduled_work (); +mmc_flush_scheduled_work (host);mmc_bus_get (host);if (host->bus_ops && !host->bus_dead) {
Signature · 1 line
1.5.4.3
Quoted 6 lines · On Tue, 17 Feb 2009 15:32:10 +0200 Jorg Schummer…
The delayed work item mmc_host.detect is now cancelled before flushing the work queue. This takes care of cases when
delayed_workwas scheduled for mmc_host.detect, but not yet placed in the work queue.Signed-off-by Jorg Schummer <[email protected]>---
Do the cancel in the caller instead. The flush routine is supposed to mimic the global workqueue.
Rgds
Signature · 9 lines
-- Pierre Ossman Linux kernel, MMC maintainer http://www.kernel.org rdesktop, core developer http://www.rdesktop.org WARNING: This correspondence is being monitored by the Swedish government. Make sure your server uses encryption for SMTP traffic and consider using PGP for end-to-end encryption.
PATCH 1/1 MMC: core/core.c: fixed: 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.
--- drivers/mmc/core/core.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/mmc/core/core.c +2 -0
@@ -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);
Signature · 1 line
1.5.4.3
Pierre Ossman
AppliedQuoted 6 lines · On Thu, 19 Feb 2009 13:17:03 +0200 Jorg Schummer…
The delayed work item mmc_host.detect is now cancelled before flushing the work queue. This takes care of cases when
delayed_workwas scheduled for mmc_host.detect, but not yet placed in the work queue.Signed-off-by Jorg Schummer <[email protected]>---
Queued, thanks.
Rgds
Signature · 9 lines
-- Pierre Ossman Linux kernel, MMC maintainer http://www.kernel.org rdesktop, core developer http://www.rdesktop.org WARNING: This correspondence is being monitored by the Swedish government. Make sure your server uses encryption for SMTP traffic and consider using PGP for end-to-end encryption.