aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk/at91/clk-programmable.c
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2016-09-25 13:53:58 +0200
committerStephen Boyd <sboyd@codeaurora.org>2016-10-20 16:37:56 -0700
commit91bbc174d45c347aa7aedb2215cc7d2013c06c1f (patch)
treeed6da3e83eb3eb294a3e159ec111074315afd392 /drivers/clk/at91/clk-programmable.c
parentclk: uniphier: rename MIO clock to SD clock for Pro5, PXs2, LD20 SoCs (diff)
downloadlinux-dev-91bbc174d45c347aa7aedb2215cc7d2013c06c1f.tar.xz
linux-dev-91bbc174d45c347aa7aedb2215cc7d2013c06c1f.zip
clk: at91: Fix a return value in case of error
If 'clk_hw_register()' fails, it is likely that we expect to return an error instead of a valid pointer (which would mean success). Fix commit f5644f10dcfb ("clk: at91: Migrate to clk_hw based registration and OF APIs") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to '')
-rw-r--r--drivers/clk/at91/clk-programmable.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/at91/clk-programmable.c b/drivers/clk/at91/clk-programmable.c
index 190122e64a3a..85a449cf61e3 100644
--- a/drivers/clk/at91/clk-programmable.c
+++ b/drivers/clk/at91/clk-programmable.c
@@ -203,7 +203,7 @@ at91_clk_register_programmable(struct regmap *regmap,
ret = clk_hw_register(NULL, &prog->hw);
if (ret) {
kfree(prog);
- hw = &prog->hw;
+ hw = ERR_PTR(ret);
}
return hw;