From: Peter Griffin Date: Tue, 20 Feb 2024 11:50:10 +0000 (+0000) Subject: mfd: syscon: Call of_node_put() only when of_parse_phandle() takes a ref X-Git-Tag: v5.15.153~97 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d50e295784eb0c8d1ea60a0f52d86ef46a75289;p=thirdparty%2Fkernel%2Fstable.git mfd: syscon: Call of_node_put() only when of_parse_phandle() takes a ref [ Upstream commit d2b0680cf3b05490b579e71b0df6e07451977745 ] 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 Link: https://lore.kernel.org/r/20240220115012.471689-2-peter.griffin@linaro.org Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c index 552b1861adad4..75c732ee9ed6e 100644 --- a/drivers/mfd/syscon.c +++ b/drivers/mfd/syscon.c @@ -224,7 +224,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; }