Commit e7cb756f authored by Ethan Du's avatar Ethan Du Committed by Linus Torvalds

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: default avatarEthan <ethan.too@gmail.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
Acked-by: default avatarAdrian Hunter <adrian.hunter@nokia.com>
Acked-by: default avatarMadhusudhan Chikkature <madhu.cr@ti.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 23ef309a
...@@ -2323,8 +2323,8 @@ static int omap_hsmmc_suspend(struct device *dev) ...@@ -2323,8 +2323,8 @@ static int omap_hsmmc_suspend(struct device *dev)
} }
} }
cancel_work_sync(&host->mmc_carddetect_work); cancel_work_sync(&host->mmc_carddetect_work);
mmc_host_enable(host->mmc);
ret = mmc_suspend_host(host->mmc); ret = mmc_suspend_host(host->mmc);
mmc_host_enable(host->mmc);
if (ret == 0) { if (ret == 0) {
omap_hsmmc_disable_irq(host); omap_hsmmc_disable_irq(host);
OMAP_HSMMC_WRITE(host->base, HCTL, OMAP_HSMMC_WRITE(host->base, HCTL,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment