projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5cfe961
)
clk: sunxi: Fix checking return value of clk_register_[composite|factors]
author
Axel Lin
<axel.lin@ingics.com>
Fri, 12 Jul 2013 08:15:15 +0000
(16:15 +0800)
committer
Mike Turquette
<mturquette@linaro.org>
Thu, 8 Aug 2013 22:57:27 +0000
(15:57 -0700)
clk_register_composite() and clk_register_factors() return ERR_PTR on error.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
drivers/clk/sunxi/clk-sunxi.c
patch
|
blob
|
history
diff --git
a/drivers/clk/sunxi/clk-sunxi.c
b/drivers/clk/sunxi/clk-sunxi.c
index
412912b
..
02e440b
100644
(file)
--- a/
drivers/clk/sunxi/clk-sunxi.c
+++ b/
drivers/clk/sunxi/clk-sunxi.c
@@
-64,7
+64,7
@@
static void __init sunxi_osc_clk_setup(struct device_node *node)
&gate->hw, &clk_gate_ops,
CLK_IS_ROOT);
- if (
clk
) {
+ if (
!IS_ERR(clk)
) {
of_clk_add_provider(node, of_clk_src_simple_get, clk);
clk_register_clkdev(clk, clk_name, NULL);
}
@@
-221,7
+221,7
@@
static void __init sunxi_factors_clk_setup(struct device_node *node,
clk = clk_register_factors(NULL, clk_name, parent, 0, reg,
data->table, data->getter, &clk_lock);
- if (
clk
) {
+ if (
!IS_ERR(clk)
) {
of_clk_add_provider(node, of_clk_src_simple_get, clk);
clk_register_clkdev(clk, clk_name, NULL);
}