From: Guennadi Liakhovetski Date: Thu, 11 Nov 2010 16:32:25 +0000 (+0100) Subject: mmc: fix rmmod race for hosts using card-detection polling X-Git-Tag: MMI-PSA29.97-13-9~21671^2~4 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d9bcbf343ec63e1104b5276195888ee06b4d086f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git mmc: fix rmmod race for hosts using card-detection polling MMC hosts that poll for card detection by defining the MMC_CAP_NEEDS_POLL flag have a race on rmmod, where the delayed work is cancelled without waiting for completed polling. To prevent this a _sync version of the work cancellation has to be used. Signed-off-by: Guennadi Liakhovetski Cc: Signed-off-by: Chris Ball --- diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 8f86d702e46e..31ae07a36576 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1559,7 +1559,7 @@ void mmc_stop_host(struct mmc_host *host) if (host->caps & MMC_CAP_DISABLE) cancel_delayed_work(&host->disable); - cancel_delayed_work(&host->detect); + cancel_delayed_work_sync(&host->detect); mmc_flush_scheduled_work(); /* clear pm flags now and let card drivers set them as needed */