blob: 51911fbae7d8e199cc37d5930d593f2f5c8e8361 [file] [log] [blame]
From bdd848539e5529e4d0790c0ad0a7cf3d73065891 Mon Sep 17 00:00:00 2001
From: Xu Wang <>
Date: Mon, 13 Jul 2020 03:21:43 +0000
Subject: [PATCH] clk: clk-atlas6: fix return value check in atlas6_clk_init()
commit 12b90b40854a8461a02ef19f6f4474cc88d64b66 upstream.
In case of error, the function clk_register() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check
should be replaced with IS_ERR().
Signed-off-by: Xu Wang <>
Acked-by: Barry Song <>
Fixes: 7bf21bc81f28 ("clk: sirf: re-arch to make the codes support both prima2 and atlas6")
Signed-off-by: Stephen Boyd <>
Signed-off-by: Paul Gortmaker <>
diff --git a/drivers/clk/sirf/clk-atlas6.c b/drivers/clk/sirf/clk-atlas6.c
index c84d5bab7ac2..b95483bb6a5e 100644
--- a/drivers/clk/sirf/clk-atlas6.c
+++ b/drivers/clk/sirf/clk-atlas6.c
@@ -135,7 +135,7 @@ static void __init atlas6_clk_init(struct device_node *np)
for (i = pll1; i < maxclk; i++) {
atlas6_clks[i] = clk_register(NULL, atlas6_clk_hw_array[i]);
- BUG_ON(!atlas6_clks[i]);
+ BUG_ON(IS_ERR(atlas6_clks[i]));
clk_register_clkdev(atlas6_clks[cpu], NULL, "cpu");
clk_register_clkdev(atlas6_clks[io], NULL, "io");