summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSimon Baatz <gmbnomis@gmail.com>2013-06-09 22:14:14 +0200
committerChris Ball <cjb@laptop.org>2013-06-27 10:23:05 -0400
commitb88576965b9518018c604865212294719ca2744f (patch)
treebb6ba8f4f31ca0f71136580e6111aeebf1212539 /drivers
parent274a752b1adc7e756acb283edc188f27fb3be6f8 (diff)
downloadlinux-b88576965b9518018c604865212294719ca2744f.tar.bz2
mmc: mxcmmc: handle mmc_of_parse() errors during probe
Signed-off-by: Simon Baatz <gmbnomis@gmail.com> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/mxcmmc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index 786448a10f15..c174c6a0d224 100644
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -1067,7 +1067,9 @@ static int mxcmci_probe(struct platform_device *pdev)
goto out_release_mem;
}
- mmc_of_parse(mmc);
+ ret = mmc_of_parse(mmc);
+ if (ret)
+ goto out_free;
mmc->ops = &mxcmci_ops;
/* For devicetree parsing, the bus width is read from devicetree */