Skip to contentSkip to conversation

clk: sunxi: Fix checking return value of clk_register_[composite|factors]

PATCH New Axel Lin 3 participants 3 messages Jul 12, 2013 – Aug 5, 2013

Subsystems (3)
Common clk Arm/Allwinner sunXi SoC support Arm/Allwinner SoC Clock Support
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 clk: sunxi: Fix checking return value of clk_register_[composite|factors]

clk_register_composite() and clk_register_factors() return ERR_PTR on error.

Signed-off-by Axel Lin <[email protected]>
---
 drivers/clk/sunxi/clk-sunxi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/sunxi/clk-sunxi.c +2 -2
index 412912b..02e440b 100644
@@ -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);
 	}
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/1 clk: sunxi: Fix checking return value of clk_register_[composite|factors]

Hi Axel,

Quoted 3 lines · Axel Lin

clk_register_composite() and clk_register_factors() return ERR_PTR on error.

Signed-off-by Axel Lin <[email protected]>
Acked-by Maxime Ripard <[email protected]>

Thanks for this patch!
Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130715/24106ae7/attachment.sig>
#2 lore raw

PATCH 1/1 clk: sunxi: Fix checking return value of clk_register_[composite|factors]

Quoting Maxime Ripard (2013-07-15 06:42:35)

Quoted 9 lines

Hi Axel,

Quoted 3 lines · Axel Lin

clk_register_composite() and clk_register_factors() return ERR_PTR on error.

Signed-off-by Axel Lin <[email protected]>
Acked-by Maxime Ripard <[email protected]>

Taken into clk-next.

Thanks!
Mike

Quoted 8 lines

Thanks for this patch!
Maxime

Signature · 3 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com