2023-07-12 10:53:02

by Minjie Du

Subject: [PATCH v1] drivers: clk: keystone: Fix parameter judgment in _of_pll_clk_init()

The function clk_register_pll() may return NULL(in line 149) or ERR_PTR
(in line 131).
Fix: make IS_ERR_OR_NULL() judge the clk_register_pll() function return.

Signed-off-by: Minjie Du <[email protected]>
---
drivers/clk/keystone/pll.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/keystone/pll.c b/drivers/clk/keystone/pll.c
index d59a7621b..ee5c72369 100644
--- a/drivers/clk/keystone/pll.c
+++ b/drivers/clk/keystone/pll.c
@@ -209,7 +209,7 @@ static void __init _of_pll_clk_init(struct device_node *node, bool pllctrl)
}

clk = clk_register_pll(NULL, node->name, parent_name, pll_data);
- if (clk) {
+ if (!IS_ERR_OR_NULL(clk)) {
of_clk_add_provider(node, of_clk_src_simple_get, clk);
return;
}
--
2.39.0

2023-07-19 22:25:03

by Stephen Boyd

Subject: Re: [PATCH v1] drivers: clk: keystone: Fix parameter judgment in _of_pll_clk_init()

Quoting Minjie Du (2023-07-12 03:22:46)
> The function clk_register_pll() may return NULL(in line 149) or ERR_PTR
> (in line 131).
> Fix: make IS_ERR_OR_NULL() judge the clk_register_pll() function return.
>
> Signed-off-by: Minjie Du <[email protected]>
> ---

Applied to clk-next