Skip to content

Commit a5d14f8

Browse files
Dan Carpenterbebarino
authored andcommitted
clk: keystone: pll: fix a couple NULL vs IS_ERR() checks
The clk_register_divider() and clk_register_mux() functions returns error pointers on error but this code checks for NULL. Fix that. Fixes: b9e0d40 ("clk: keystone: add Keystone PLL clock driver") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://lore.kernel.org/r/d9da4c97-0da9-499f-9a21-1f8e3f148dc1@moroto.mountain Signed-off-by: Stephen Boyd <sboyd@kernel.org>
1 parent 6191023 commit a5d14f8

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

  • drivers/clk/keystone

drivers/clk/keystone/pll.c

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -281,12 +281,13 @@ static void __init of_pll_div_clk_init(struct device_node *node)
281281

282282
clk = clk_register_divider(NULL, clk_name, parent_name, 0, reg, shift,
283283
mask, 0, NULL);
284-
if (clk) {
285-
of_clk_add_provider(node, of_clk_src_simple_get, clk);
286-
} else {
284+
if (IS_ERR(clk)) {
287285
pr_err("%s: error registering divider %s\n", __func__, clk_name);
288286
iounmap(reg);
287+
return;
289288
}
289+
290+
of_clk_add_provider(node, of_clk_src_simple_get, clk);
290291
}
291292
CLK_OF_DECLARE(pll_divider_clock, "ti,keystone,pll-divider-clock", of_pll_div_clk_init);
292293

@@ -328,10 +329,12 @@ static void __init of_pll_mux_clk_init(struct device_node *node)
328329
clk = clk_register_mux(NULL, clk_name, (const char **)&parents,
329330
ARRAY_SIZE(parents) , 0, reg, shift, mask,
330331
0, NULL);
331-
if (clk)
332-
of_clk_add_provider(node, of_clk_src_simple_get, clk);
333-
else
332+
if (IS_ERR(clk)) {
334333
pr_err("%s: error registering mux %s\n", __func__, clk_name);
334+
return;
335+
}
336+
337+
of_clk_add_provider(node, of_clk_src_simple_get, clk);
335338
}
336339
CLK_OF_DECLARE(pll_mux_clock, "ti,keystone,pll-mux-clock", of_pll_mux_clk_init);
337340

0 commit comments

Comments
 (0)