Skip to contentSkip to conversation

clk: sunxi: pll2: Fix return value check in sun4i_pll2_setup()

PATCH New weiyj_lk at 163.com 2 participants 2 messages Jul 6, 2016 – Jul 9, 2016

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

weiyj_lk at 163.com

author
#0 lore raw

PATCH 1/1 clk: sunxi: pll2: Fix return value check in sun4i_pll2_setup()

From: Wei Yongjun <[email protected]>

In case of error, the functions clk_register_composite() and clk_register_divider() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR().

Signed-off-by Wei Yongjun <[email protected]>
---
 drivers/clk/sunxi/clk-a10-pll2.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/sunxi/clk-a10-pll2.c +2 -2
index 0ee1f36..d8eab90 100644
@@ -73,7 +73,7 @@ static void __init sun4i_pll2_setup(struct device_node *node,
 					  SUN4I_PLL2_PRE_DIV_WIDTH,
 					  CLK_DIVIDER_ONE_BASED | CLK_DIVIDER_ALLOW_ZERO,
 					  &sun4i_a10_pll2_lock);
-	if (!prediv_clk) {
+	if (IS_ERR(prediv_clk)) {
 		pr_err("Couldn't register the prediv clock\n");
 		goto err_free_array;
 	}

@@ -106,7 +106,7 @@ static void __init sun4i_pll2_setup(struct device_node *node,
 					  &mult->hw, &clk_multiplier_ops,
 					  &gate->hw, &clk_gate_ops,
 					  CLK_SET_RATE_PARENT);
-	if (!base_clk) {
+	if (IS_ERR(base_clk)) {
 		pr_err("Couldn't register the base multiplier clock\n");
 		goto err_free_multiplier;
 	}
Applied
#1 lore raw

PATCH 1/1 clk: sunxi: pll2: Fix return value check in sun4i_pll2_setup()

Quoted 8 lines · On Wed, Jul 06, 2016 at 12:18:34PM +0000, weiyj_lk at 163.com wrote:

From: Wei Yongjun <[email protected]>

In case of error, the functions clk_register_composite() and clk_register_divider() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR().

Signed-off-by Wei Yongjun <[email protected]>

Applied, thanks
Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160709/9d6fff52/attachment.sig>