Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7de427d0 authored by Jorg Schummer's avatar Jorg Schummer Committed by Pierre Ossman
Browse files

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: default avatarJorg Schummer <ext-jorg.2.schummer@nokia.com>
Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent 89c8aa20

drivers/mmc/core/core.c

+2 −0
Original line number Diff line number Diff line
@@ -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);