summaryrefslogtreecommitdiff
path: root/drivers/clk/at91/clk-h32mx.c
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2015-07-06 22:54:58 (GMT)
committerStephen Boyd <sboyd@codeaurora.org>2015-07-06 22:54:58 (GMT)
commitf75073fabd9a85028ee9ff40e7f7cbb3a869678b (patch)
treea06cb835fd82a51e5ad6ced36b06aac213707c1b /drivers/clk/at91/clk-h32mx.c
parentd770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 (diff)
parent7b2a4635b84b4dbb07c93201a8c0aea82ed65e4f (diff)
downloadlinux-f75073fabd9a85028ee9ff40e7f7cbb3a869678b.tar.xz
Merge branch 'clk-fixes' into clk-next
* clk-fixes: clk: mediatek: mt8173: Fix enabling of critical clocks drivers: clk: st: Fix mux bit-setting for Cortex A9 clocks drivers: clk: st: Add CLK_GET_RATE_NOCACHE flag to clocks drivers: clk: st: Fix flexgen lock init drivers: clk: st: Fix FSYN channel values drivers: clk: st: Remove unused code clk: qcom: Use parent rate when set rate to pixel RCG clock clk: at91: do not leak resources clk: stm32: Fix out-by-one error path in the index lookup clk: iproc: fix bit manipulation arithmetic clk: iproc: fix memory leak from clock name
Diffstat (limited to 'drivers/clk/at91/clk-h32mx.c')
-rw-r--r--drivers/clk/at91/clk-h32mx.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/clk/at91/clk-h32mx.c b/drivers/clk/at91/clk-h32mx.c
index 152dcb3..61566bc 100644
--- a/drivers/clk/at91/clk-h32mx.c
+++ b/drivers/clk/at91/clk-h32mx.c
@@ -116,8 +116,10 @@ void __init of_sama5d4_clk_h32mx_setup(struct device_node *np,
h32mxclk->pmc = pmc;
clk = clk_register(NULL, &h32mxclk->hw);
- if (!clk)
+ if (!clk) {
+ kfree(h32mxclk);
return;
+ }
of_clk_add_provider(np, of_clk_src_simple_get, clk);
}