lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmc: msm_sdcc: Handle dma resource not present case

Browse Source 
If DMA resource is not available then SDCC driver
should atleast work in PIO data transfer mode.

Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Subhash Jadavani
2011-05-02 18:10:40 +05:30
committed by Chris Ball
parent 19207f056d
commit 190657c9f4
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/mmc/host/msm_sdcc.c
View File

@@ -1242,9 +1242,13 @@ msmsdcc_probe(struct platform_device *pdev)
/* /*
* Setup DMA * Setup DMA
*/ */
ret = msmsdcc_init_dma(host); if (host->dmares) {
if (ret) ret = msmsdcc_init_dma(host);
goto ioremap_free; if (ret)
goto ioremap_free;
} else {
host->dma.channel = -1;
}
/* Get our clocks */ /* Get our clocks */
host->pclk = clk_get(&pdev->dev, "sdc_pclk"); host->pclk = clk_get(&pdev->dev, "sdc_pclk");
@@ -1388,8 +1392,9 @@ msmsdcc_probe(struct platform_device *pdev)
pclk_put: pclk_put:
clk_put(host->pclk); clk_put(host->pclk);
dma_free: dma_free:
dma_free_coherent(NULL, sizeof(struct msmsdcc_nc_dmadata), if (host->dmares)
host->dma.nc, host->dma.nc_busaddr); dma_free_coherent(NULL, sizeof(struct msmsdcc_nc_dmadata),
host->dma.nc, host->dma.nc_busaddr);
ioremap_free: ioremap_free:
tasklet_kill(&host->dma_tlet); tasklet_kill(&host->dma_tlet);
iounmap(host->base); iounmap(host->base);