mfd: syscon: Call of_node_put() only when of_parse_phandle() takes a ref

BugLink: https://bugs.launchpad.net/bugs/2060097

[ 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: 45330bb434 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit 1a64727ff6e87c91ff9c6fbbc595cc93fb25fab6)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

This commit is contained in:

Peter Griffin

2024-02-20 11:50:10 +00:00

committed by

Roxana Nicolescu

parent 0032cbfadc

commit ccd51138a9

1 changed files with 3 additions and 1 deletions

									
										drivers/mfd/syscon.c
									
		+3
		-1
	
												View 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;

				}