mfd: syscon: Call of_node_put() only when of_parse_phandle() takes a ref
authorPeter Griffin <peter.griffin@linaro.org>
Tue, 20 Feb 2024 11:50:10 +0000 (11:50 +0000)
committerLee Jones <lee@kernel.org>
Fri, 23 Feb 2024 16:02:02 +0000 (16:02 +0000)
of_parse_phandle() returns a device_node with refcount incremented, which
the callee needs to call of_node_put() on when done. We should only call
of_node_put() when the property argument is provided though as otherwise
nothing has taken a reference on the node.

Fixes: 45330bb43421 ("mfd: syscon: Allow property as NULL in syscon_regmap_lookup_by_phandle")
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Link: https://lore.kernel.org/r/20240220115012.471689-2-peter.griffin@linaro.org
Signed-off-by: Lee Jones <lee@kernel.org>
drivers/mfd/syscon.c

index c9550368d9ea5e1aee88170f50b1bf6c04b09d37..7d0e91164cbaa3dde29f7d517b28bef2f8861179 100644 (file)
@@ -238,7 +238,9 @@ struct regmap *syscon_regmap_lookup_by_phandle(struct device_node *np,
                return ERR_PTR(-ENODEV);
 
        regmap = syscon_node_to_regmap(syscon_np);
-       of_node_put(syscon_np);
+
+       if (property)
+               of_node_put(syscon_np);
 
        return regmap;
 }