diff options
| author | Peter Griffin <peter.griffin@linaro.org> | 2024-02-20 11:50:10 +0000 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2024-03-26 18:19:51 -0400 |
| commit | 1b01e66c1ce4769adebc5218133a09545e54859f (patch) | |
| tree | 41c26c42bea35fdeb87226d90d103fed01551df2 /drivers | |
| parent | 81d998e183113845cef5740a88b32f9dc9f02fae (diff) | |
| download | linux-stable-1b01e66c1ce4769adebc5218133a09545e54859f.tar.gz linux-stable-1b01e66c1ce4769adebc5218133a09545e54859f.tar.bz2 linux-stable-1b01e66c1ce4769adebc5218133a09545e54859f.zip | |
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 <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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mfd/syscon.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c index c9550368d9ea..7d0e91164cba 100644 --- a/drivers/mfd/syscon.c +++ b/drivers/mfd/syscon.c @@ -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; } |