summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-11-19 11:16:59 -0200
committerUlf Hansson <ulf.hansson@linaro.org>2014-11-26 14:31:04 +0100
commite34d467c515f5f64e12c28fb2b15035c9b38f332 (patch)
treebdecd62c98f23af780307c88c8ede3c97b7d2462 /drivers/mmc
parent5654d90064bda87a9738fd6fcfcfca5537754259 (diff)
downloadtalos-obmc-linux-e34d467c515f5f64e12c28fb2b15035c9b38f332.tar.gz
talos-obmc-linux-e34d467c515f5f64e12c28fb2b15035c9b38f332.zip
mmc: mxs-mmc: Check for clk_prepare_enable() error
clk_prepare_enable() may fail and in this case we should propagate the error. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/mxs-mmc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index f2c49e0e213d..60c4ca97a727 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -619,7 +619,9 @@ static int mxs_mmc_probe(struct platform_device *pdev)
ret = PTR_ERR(ssp->clk);
goto out_mmc_free;
}
- clk_prepare_enable(ssp->clk);
+ ret = clk_prepare_enable(ssp->clk);
+ if (ret)
+ goto out_mmc_free;
ret = mxs_mmc_reset(host);
if (ret) {
@@ -719,8 +721,7 @@ static int mxs_mmc_resume(struct device *dev)
struct mxs_mmc_host *host = mmc_priv(mmc);
struct mxs_ssp *ssp = &host->ssp;
- clk_prepare_enable(ssp->clk);
- return 0;
+ return clk_prepare_enable(ssp->clk);
}
#endif
OpenPOWER on IntegriCloud