mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
mmc: sdhci-pxav3: handle mmc_of_parse() errors during probe
Signed-off-by: Simon Baatz <gmbnomis@gmail.com> Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
parent
b88576965b
commit
d2cf6071cc
1 changed files with 5 additions and 2 deletions
|
@ -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);
|
||||
if (match) {
|
||||
mmc_of_parse(host->mmc);
|
||||
ret = mmc_of_parse(host->mmc);
|
||||
if (ret)
|
||||
goto err_of_parse;
|
||||
sdhci_get_of_property(pdev);
|
||||
pdata = pxav3_get_mmc_pdata(dev);
|
||||
} else if (pdata) {
|
||||
|
@ -313,10 +315,11 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
|
|||
|
||||
return 0;
|
||||
|
||||
err_of_parse:
|
||||
err_cd_req:
|
||||
err_add_host:
|
||||
clk_disable_unprepare(clk);
|
||||
clk_put(clk);
|
||||
err_cd_req:
|
||||
err_clk_get:
|
||||
sdhci_pltfm_free(pdev);
|
||||
kfree(pxa);
|
||||
|
|
Loading…
Reference in a new issue