| From 6a3b2f7e0e60638bf9d1f8816711fcdfed038912 Mon Sep 17 00:00:00 2001 |
| From: Simon Baatz <gmbnomis@gmail.com> |
| Date: Sun, 9 Jun 2013 22:14:12 +0200 |
| Subject: mmc: sh_mmcif: handle mmc_of_parse() errors during probe |
| |
| Signed-off-by: Simon Baatz <gmbnomis@gmail.com> |
| Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> |
| Signed-off-by: Chris Ball <cjb@laptop.org> |
| (cherry picked from commit 2c9054dc102742e1683b5d879f7472fb712b7324) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/sh_mmcif.c | 7 ++++++- |
| 1 file changed, 6 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c |
| index 3ae1a1f8..6f9834fd 100644 |
| --- a/drivers/mmc/host/sh_mmcif.c |
| +++ b/drivers/mmc/host/sh_mmcif.c |
| @@ -1370,7 +1370,11 @@ static int sh_mmcif_probe(struct platform_device *pdev) |
| ret = -ENOMEM; |
| goto ealloch; |
| } |
| - mmc_of_parse(mmc); |
| + |
| + ret = mmc_of_parse(mmc); |
| + if (ret < 0) |
| + goto eofparse; |
| + |
| host = mmc_priv(mmc); |
| host->mmc = mmc; |
| host->addr = reg; |
| @@ -1465,6 +1469,7 @@ eclkupdate: |
| clk_put(host->hclk); |
| eclkget: |
| pm_runtime_disable(&pdev->dev); |
| +eofparse: |
| mmc_free_host(mmc); |
| ealloch: |
| iounmap(reg); |
| -- |
| 1.8.4.3.gca3854a |
| |
