mmc: sdhci-of-esdhc: Handle error from mmc_of_parse()

Since mmc_of_parse() may fail, let's deal with it and thus do proper
error handling.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c
index 4a654d4ec8db3f04be92e6aafb243bc9b928b7ba..17fe02ed667263a710f1aff755a8f94049c641a2 100644 (file)
--- a/drivers/mmc/host/sdhci-of-esdhc.c
+++ b/drivers/mmc/host/sdhci-of-esdhc.c
@@ -370,13 +370,19 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)
        }
 
        /* call to generic mmc_of_parse to support additional capabilities */
-       mmc_of_parse(host->mmc);
+       ret = mmc_of_parse(host->mmc);
+       if (ret)
+               goto err;
+
        mmc_of_parse_voltage(np, &host->ocr_mask);
 
        ret = sdhci_add_host(host);
        if (ret)
-               sdhci_pltfm_free(pdev);
+               goto err;
 
+       return 0;
+ err:
+       sdhci_pltfm_free(pdev);
        return ret;
 }