summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2015-08-23 02:11:17 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2015-08-27 14:50:56 +0200
commit3b1cac4d9f915758d0d755f11bb8fd4373cf653b (patch)
treeff5e5b2a97e472236beaf8ab27581023795afea0 /drivers/mmc
parent38276a912c9bb6dc48e21dc23a92b6286ca00962 (diff)
downloadlinux-3b1cac4d9f915758d0d755f11bb8fd4373cf653b.tar.bz2
mmc: usdhi6rol0: fix error return code
Propagate error code on failure. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ identifier ret; expression e1,e2; @@ ( if (\(ret < 0\|ret != 0\)) { ... return ret; } | ret = 0 ) ... when != ret = e1 when != &ret *if(...) { ... when != ret = e2 when forall return ret; } // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/usdhi6rol0.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/host/usdhi6rol0.c b/drivers/mmc/host/usdhi6rol0.c
index b505cbc25aac..4498e92116b8 100644
--- a/drivers/mmc/host/usdhi6rol0.c
+++ b/drivers/mmc/host/usdhi6rol0.c
@@ -1737,8 +1737,10 @@ static int usdhi6_probe(struct platform_device *pdev)
}
host->clk = devm_clk_get(dev, NULL);
- if (IS_ERR(host->clk))
+ if (IS_ERR(host->clk)) {
+ ret = PTR_ERR(host->clk);
goto e_free_mmc;
+ }
host->imclk = clk_get_rate(host->clk);