Skip to content

Commit

Permalink
mfd: altera-sysmgr: Call of_node_put() only when of_parse_phandle() t…
Browse files Browse the repository at this point in the history
…akes a ref

[ Upstream commit e28c28a34ee9fa2ea671a20e5e7064e6220d55e7 ]

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: f36e789 ("mfd: altera-sysmgr: Add SOCFPGA System Manager")
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Link: https://lore.kernel.org/r/20240220115012.471689-4-peter.griffin@linaro.org
Signed-off-by: Lee Jones <lee@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
petegriffin authored and Sasha Levin committed Mar 26, 2024
1 parent 1b01e66 commit 1842114
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/mfd/altera-sysmgr.c
Expand Up @@ -109,7 +109,9 @@ struct regmap *altr_sysmgr_regmap_lookup_by_phandle(struct device_node *np,

dev = driver_find_device_by_of_node(&altr_sysmgr_driver.driver,
(void *)sysmgr_np);
of_node_put(sysmgr_np);
if (property)
of_node_put(sysmgr_np);

if (!dev)
return ERR_PTR(-EPROBE_DEFER);

Expand Down

0 comments on commit 1842114

Please sign in to comment.