xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmc: tmio: fix a deadlock

Browse Source 
Currently the tmio-mmc driver contains a recursive runtime PM method
invocation, which leads to a deadlock on a mutex. Avoid it by taking
care not to request DMA too early.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Guennadi Liakhovetski
2011-07-14 18:39:10 +02:00
committed by Chris Ball
parent 332bdb506f
commit 162f43e31c
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mmc/host/tmio_mmc_pio.c
View File

@@ -984,7 +984,7 @@ int tmio_mmc_host_resume(struct device *dev)
if (host->pm_global) {
/* Runtime PM resume callback didn't run */
tmio_mmc_reset(host);
tmio_mmc_request_dma(host, host->pdata);
tmio_mmc_enable_dma(host, true);
host->pm_global = false;
}
@@ -1007,7 +1007,7 @@ int tmio_mmc_host_runtime_resume(struct device *dev)
struct tmio_mmc_data *pdata = host->pdata;
tmio_mmc_reset(host);
tmio_mmc_request_dma(host, host->pdata);
tmio_mmc_enable_dma(host, true);
if (pdata->power) {
/* Only entered after a card-insert interrupt */