hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mmc: msm_sdcc: Handle error cases in probe 

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:
Sahitya Tummala 2011-05-02 18:06:05 +05:30 committed by Chris Ball
parent e91957e70d
commit dce7c756c8
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1215,7 +1215,7 @@ msmsdcc_probe(struct platform_device *pdev)
host->base = ioremap(memres->start, PAGE_SIZE); host->base = ioremap(memres->start, PAGE_SIZE);
if (!host->base) { if (!host->base) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto host_free;
} }
host->cmd_irqres = cmd_irqres; host->cmd_irqres = cmd_irqres;
@ -1230,13 +1230,15 @@ msmsdcc_probe(struct platform_device *pdev)
/* /*
* Setup DMA * Setup DMA
*/ */
msmsdcc_init_dma(host); ret = msmsdcc_init_dma(host);
if (ret)
goto ioremap_free;
/* Get our clocks */ /* Get our clocks */
host->pclk = clk_get(&pdev->dev, "sdc_pclk"); host->pclk = clk_get(&pdev->dev, "sdc_pclk");
if (IS_ERR(host->pclk)) { if (IS_ERR(host->pclk)) {
ret = PTR_ERR(host->pclk); ret = PTR_ERR(host->pclk);
goto host_free; goto dma_free;
} }
host->clk = clk_get(&pdev->dev, "sdc_clk"); host->clk = clk_get(&pdev->dev, "sdc_clk");
@ -1377,6 +1379,12 @@ msmsdcc_probe(struct platform_device *pdev)
clk_put(host->clk); clk_put(host->clk);
pclk_put: pclk_put:
clk_put(host->pclk); clk_put(host->pclk);
dma_free:
dma_free_coherent(NULL, sizeof(struct msmsdcc_nc_dmadata),
host->dma.nc, host->dma.nc_busaddr);
ioremap_free:
tasklet_kill(&host->dma_tlet);
iounmap(host->base);
host_free: host_free:
mmc_free_host(mmc); mmc_free_host(mmc);
out: out: