diff options
| author | Simon Baatz <gmbnomis@gmail.com> | 2013-06-09 16:14:14 -0400 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2013-06-27 10:23:05 -0400 |
| commit | b88576965b9518018c604865212294719ca2744f (patch) | |
| tree | bb6ba8f4f31ca0f71136580e6111aeebf1212539 /drivers/mmc | |
| parent | 274a752b1adc7e756acb283edc188f27fb3be6f8 (diff) | |
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/mmc')
| -rw-r--r-- | drivers/mmc/host/mxcmmc.c | 4 |
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) | |||
| 1067 | goto out_release_mem; | 1067 | goto out_release_mem; |
| 1068 | } | 1068 | } |
| 1069 | 1069 | ||
| 1070 | mmc_of_parse(mmc); | 1070 | ret = mmc_of_parse(mmc); |
| 1071 | if (ret) | ||
| 1072 | goto out_free; | ||
| 1071 | mmc->ops = &mxcmci_ops; | 1073 | mmc->ops = &mxcmci_ops; |
| 1072 | 1074 | ||
| 1073 | /* For devicetree parsing, the bus width is read from devicetree */ | 1075 | /* For devicetree parsing, the bus width is read from devicetree */ |