diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2010-11-11 17:32:25 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-09 13:33:18 -0800 |
| commit | 7bfb0a0a1c85478e2c4c19ee1053f4bd674042f2 (patch) | |
| tree | ac3a0d13e109273b177cc6c7c64c30c9f96e08cf | |
| parent | c39b87a7108e27f558af2de04d9d70dbbe64155b (diff) | |
mmc: fix rmmod race for hosts using card-detection polling
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 <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/mmc/core/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 09eee6df0653..9ca553b79f12 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1514,7 +1514,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 */ |