2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Guennadi Liakhovetski <[email protected]> commit d9bcbf343ec63e1104b5276195888ee06b4d086f upstream. 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 <[email protected]> Signed-off-by: Chris Ball <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Andi Kleen <[email protected]> --- drivers/mmc/core/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux/drivers/mmc/core/core.c =================================================================== --- linux.orig/drivers/mmc/core/core.c +++ linux/drivers/mmc/core/core.c @@ -1160,7 +1160,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 */ _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
