From: Fabio Estevam Date: Wed, 19 Nov 2014 13:16:59 +0000 (-0200) Subject: mmc: mxs-mmc: Check for clk_prepare_enable() error X-Git-Tag: MMI-PSA29.97-13-9~11089^2~15 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e34d467c515f5f64e12c28fb2b15035c9b38f332;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: Ulf Hansson --- 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