summaryrefslogtreecommitdiff
path: root/drivers/clk
diff options
context:
space:
mode:
authorXu Wang <vulab@iscas.ac.cn>2020-07-13 06:21:43 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-21 12:05:36 +0300
commitf0b9f54f4763091d4616d4fcf104d65967820f93 (patch)
tree0051a0b1f6deede945e9058a55bbbaabc62d7526 /drivers/clk
parent7fc9f681fad28ac720acbb157445810fe0b3bf3c (diff)
downloadlinux-f0b9f54f4763091d4616d4fcf104d65967820f93.tar.xz
clk: clk-atlas6: fix return value check in atlas6_clk_init()
[ Upstream commit 12b90b40854a8461a02ef19f6f4474cc88d64b66 ] 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 <vulab@iscas.ac.cn> Link: https://lore.kernel.org/r/20200713032143.21362-1-vulab@iscas.ac.cn Acked-by: Barry Song <baohua@kernel.org> Fixes: 7bf21bc81f28 ("clk: sirf: re-arch to make the codes support both prima2 and atlas6") Signed-off-by: Stephen Boyd <sboyd@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/sirf/clk-atlas6.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/sirf/clk-atlas6.c b/drivers/clk/sirf/clk-atlas6.c
index 0cd11e6893af..25ed60776560 100644
--- a/drivers/clk/sirf/clk-atlas6.c
+++ b/drivers/clk/sirf/clk-atlas6.c
@@ -136,7 +136,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");