Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac117067 authored by Peter Griffin's avatar Peter Griffin Committed by Sasha Levin
Browse files

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: 45330bb4 ("mfd: syscon: Allow property as NULL in syscon_regmap_lookup_by_phandle")
Signed-off-by: default avatarPeter Griffin <peter.griffin@linaro.org>
Link: https://lore.kernel.org/r/20240220115012.471689-2-peter.griffin@linaro.org


Signed-off-by: default avatarLee Jones <lee@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3472fa83

drivers/mfd/syscon.c

+3 −1
Original line number Diff line number Diff line
@@ -219,6 +219,8 @@ struct regmap *syscon_regmap_lookup_by_phandle(struct device_node *np, 
		return ERR_PTR(-ENODEV);



	regmap = syscon_node_to_regmap(syscon_np);



	if (property)

		of_node_put(syscon_np);



	return regmap;