malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

mmc: sdhci-pxav3: handle mmc_of_parse() errors during probe

Browse Source 
Signed-off-by: Simon Baatz <gmbnomis@gmail.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Simon Baatz 2013-06-09 22:14:15 +02:00 committed by Chris Ball
parent b88576965b
commit d2cf6071cc
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mmc/host/sdhci-pxav3.c
View File

@ -252,7 +252,9 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
match = of_match_device(of_match_ptr(sdhci_pxav3_of_match), &pdev->dev); match = of_match_device(of_match_ptr(sdhci_pxav3_of_match), &pdev->dev);
if (match) { if (match) {
mmc_of_parse(host->mmc); ret = mmc_of_parse(host->mmc);
if (ret)
goto err_of_parse;
sdhci_get_of_property(pdev); sdhci_get_of_property(pdev);
pdata = pxav3_get_mmc_pdata(dev); pdata = pxav3_get_mmc_pdata(dev);
} else if (pdata) { } else if (pdata) {
@ -313,10 +315,11 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
return 0; return 0;
err_of_parse:
err_cd_req:
err_add_host: err_add_host:
clk_disable_unprepare(clk); clk_disable_unprepare(clk);
clk_put(clk); clk_put(clk);
err_cd_req:
err_clk_get: err_clk_get:
sdhci_pltfm_free(pdev); sdhci_pltfm_free(pdev);
kfree(pxa); kfree(pxa);