aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEthan Du <ethan.too@gmail.com>2010-09-09 16:37:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-09 18:57:23 -0700
commite7cb756fc3c7c32040283963572258381b342dff (patch)
tree59d4353875093251f4ed0bd9f01ba18086ea49b7
parent23ef309a6e070490da0a37b9b6383819f8170ea3 (diff)
downloadkernel_samsung_aries-e7cb756fc3c7c32040283963572258381b342dff.zip
kernel_samsung_aries-e7cb756fc3c7c32040283963572258381b342dff.tar.gz
kernel_samsung_aries-e7cb756fc3c7c32040283963572258381b342dff.tar.bz2
omap hsmmc: fix a racing case between kmmcd and omap_hsmmc_suspend
If suspend called when kmmcd is doing host->ops->disable, as kmmcd already increased host->en_dis_recurs to 1, the mmc_host_enable in suspend function will return directly without increase the nesting_cnt, which will cause the followed register access carried out to the disabled host. mmc_suspend_host will enable host itself. No need to enable host before it. Also works on kmmcd will get flushed in mmc_suspend_host, enable host after it will be safe. So make the mmc_host_enable after it. [cjb: rebase against current Linus] Signed-off-by: Ethan <ethan.too@gmail.com> Signed-off-by: Chris Ball <cjb@laptop.org> Acked-by: Adrian Hunter <adrian.hunter@nokia.com> Acked-by: Madhusudhan Chikkature <madhu.cr@ti.com> Cc: <linux-mmc@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/mmc/host/omap_hsmmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index fb6446a..4526d27 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -2323,8 +2323,8 @@ static int omap_hsmmc_suspend(struct device *dev)
}
}
cancel_work_sync(&host->mmc_carddetect_work);
- mmc_host_enable(host->mmc);
ret = mmc_suspend_host(host->mmc);
+ mmc_host_enable(host->mmc);
if (ret == 0) {
omap_hsmmc_disable_irq(host);
OMAP_HSMMC_WRITE(host->base, HCTL,