aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2010-11-11 17:32:25 +0100
committerChris Ball <cjb@laptop.org>2010-11-11 18:42:38 -0500
commitd9bcbf343ec63e1104b5276195888ee06b4d086f (patch)
tree984a835176d14eb49c77cded4f56a1d130b45461 /drivers
parent35ac6f081f26e1b6b3482b9c8dfccebe7817c691 (diff)
downloadmrst-s0i3-test-d9bcbf343ec63e1104b5276195888ee06b4d086f.tar.gz
mrst-s0i3-test-d9bcbf343ec63e1104b5276195888ee06b4d086f.tar.xz
mrst-s0i3-test-d9bcbf343ec63e1104b5276195888ee06b4d086f.zip
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 <g.liakhovetski@gmx.de> Cc: <stable@kernel.org> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/core/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 8f86d702e46..31ae07a3657 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 */