Skip to contentSkip to conversation

clk: sprd: Hold reference returned by of_get_parent()

PATCH Superseded Liang He 1 participant 1 message Jul 1, 2022

Subsystems (2)

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Liang He

author
#0 lore raw

PATCH v3 1/1 clk: sprd: Hold reference returned by of_get_parent()

We should hold the reference returned by of_get_parent() and use it to call of_node_put() for refcount balance.

Fixes f95e8c7923d1 ("clk: sprd: support to get regmap from parent node")

---
changelog:

v3: (1) keep original 'if-else if-else' coding style adviesd by Orson

     (2) fix typo in commit-log: of_node_out --> of_node_put

v2: minimize the effective range of of_get_parent() advised by Orson
v1: hold reference returned by of_get_parent()

v2-link: https://lore.kernel.org/all/[email protected]/
v1-link: https://lore.kernel.org/all/[email protected]/

Patched file has been compiled test in 5.19rc2.

 drivers/clk/sprd/common.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/clk/sprd/common.c +4 -3
index d620bbbcdfc8..bbe691d6a9a8 100644
@@ -41,7 +41,7 @@ int sprd_clk_regmap_init(struct platform_device *pdev,
 {
 	void __iomem *base;
 	struct device *dev = &pdev->dev;
-	struct device_node *node = dev->of_node;
+	struct device_node *node = dev->of_node, *np;
 	struct regmap *regmap;
 
 	if (of_find_property(node, "sprd,syscon", NULL)) {
@@ -50,8 +50,9 @@ int sprd_clk_regmap_init(struct platform_device *pdev,
 			pr_err("%s: failed to get syscon regmap\n", __func__);
 			return PTR_ERR(regmap);
 		}
-	} else if (of_device_is_compatible(of_get_parent(dev->of_node),
-			   "syscon")) {
+	} else if (of_device_is_compatible(np =
+	of_get_parent(dev->of_node), "syscon")
+			   || (of_node_put(np), 0)) {
 		regmap = device_node_to_regmap(of_get_parent(dev->of_node));
 		if (IS_ERR(regmap)) {
 			dev_err(dev, "failed to get regmap from its parent.\n");
Signature · 1 line
2.25.1