Commit 2c9054dc authored by Simon Baatz's avatar Simon Baatz Committed by Chris Ball

mmc: sh_mmcif: handle mmc_of_parse() errors during probe

Signed-off-by: default avatarSimon Baatz <gmbnomis@gmail.com>
Acked-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent ec0a7517
...@@ -1370,7 +1370,11 @@ static int sh_mmcif_probe(struct platform_device *pdev) ...@@ -1370,7 +1370,11 @@ static int sh_mmcif_probe(struct platform_device *pdev)
ret = -ENOMEM; ret = -ENOMEM;
goto ealloch; goto ealloch;
} }
mmc_of_parse(mmc);
ret = mmc_of_parse(mmc);
if (ret < 0)
goto eofparse;
host = mmc_priv(mmc); host = mmc_priv(mmc);
host->mmc = mmc; host->mmc = mmc;
host->addr = reg; host->addr = reg;
...@@ -1465,6 +1469,7 @@ static int sh_mmcif_probe(struct platform_device *pdev) ...@@ -1465,6 +1469,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
clk_put(host->hclk); clk_put(host->hclk);
eclkget: eclkget:
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
eofparse:
mmc_free_host(mmc); mmc_free_host(mmc);
ealloch: ealloch:
iounmap(reg); iounmap(reg);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment