Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Ethan Du and committed by
Linus Torvalds
e7cb756f 23ef309a

+1 -1
+1 -1
drivers/mmc/host/omap_hsmmc.c
··· 2323 2323 } 2324 2324 } 2325 2325 cancel_work_sync(&host->mmc_carddetect_work); 2326 - mmc_host_enable(host->mmc); 2327 2326 ret = mmc_suspend_host(host->mmc); 2327 + mmc_host_enable(host->mmc); 2328 2328 if (ret == 0) { 2329 2329 omap_hsmmc_disable_irq(host); 2330 2330 OMAP_HSMMC_WRITE(host->base, HCTL,