diff options
| author |   Simon Baatz <gmbnomis@gmail.com> | 2013-06-09 22:14:12 +0200 |
|---|---|---|
| committer |   Chris Ball <cjb@laptop.org> | 2013-06-27 10:22:50 -0400 |
| commit | 2c9054dc102742e1683b5d879f7472fb712b7324 (patch) | |
| tree | 1bee12f61653f12896ba56351db67839c6610814 /drivers/mmc/host/sh_mmcif.c | |
| parent | mmc: return mmc_of_parse() errors to caller (diff) | |
| download | linux-dev-2c9054dc102742e1683b5d879f7472fb712b7324.tar.xz linux-dev-2c9054dc102742e1683b5d879f7472fb712b7324.zip | |
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>
Diffstat (limited to 'drivers/mmc/host/sh_mmcif.c')
| -rw-r--r-- | drivers/mmc/host/sh_mmcif.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index 8ef5efad45d0..6706b5e3b974 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); |