From: Minjie Du <duminjie@vivo.com>
Date: Wed, 12 Jul 2023 10:22:46 +0000 (+0800)
Subject: drivers: clk: keystone: Fix parameter judgment in _of_pll_clk_init()
X-Git-Tag: v4.14.326~124
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe5fd9f22d1f1198e1db0d3cd70a8ea69eb74e0e;p=thirdparty%2Fkernel%2Fstable.git

drivers: clk: keystone: Fix parameter judgment in _of_pll_clk_init()

[ Upstream commit a995c50db887ef97f3160775aef7d772635a6f6e ]

The function clk_register_pll() may return NULL or an ERR_PTR. Don't
treat an ERR_PTR as valid.

Signed-off-by: Minjie Du <duminjie@vivo.com>
Link: https://lore.kernel.org/r/20230712102246.10348-1-duminjie@vivo.com
Fixes: b9e0d40c0d83 ("clk: keystone: add Keystone PLL clock driver")
[sboyd@kernel.org: Reword commit text]
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/drivers/clk/keystone/pll.c b/drivers/clk/keystone/pll.c
index e7e840fb74eaf..526694c2a6c97 100644
--- a/drivers/clk/keystone/pll.c
+++ b/drivers/clk/keystone/pll.c
@@ -213,7 +213,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;
 	}