diff options
author | Colin Cross <ccross@android.com> | 2010-12-21 18:34:37 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2010-12-21 18:34:37 -0800 |
commit | b104a07edb2a319f734ddc4fe04852865d8d9e24 (patch) | |
tree | a0cd50b3d84ece4d94e366fac4b440e380c2d247 /drivers/mmc | |
parent | e87ec4d59e1f96381547e614c5279bed63775719 (diff) | |
parent | a1346c99fc89f2b3d35c7d7e2e4aef8ea4124342 (diff) |
Merge commit 'v2.6.36.2' into linux-tegra-2.6.36
Diffstat (limited to 'drivers/mmc')
-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 */ |