]> xenbits.xensource.com Git - people/aperard/linux.git/commitdiff
mfd: altera-sysmgr: Call of_node_put() only when of_parse_phandle() takes a ref
authorPeter Griffin <peter.griffin@linaro.org>
Tue, 20 Feb 2024 11:50:12 +0000 (11:50 +0000)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:20:50 +0000 (18:20 -0400)
[ 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: f36e789a1f8d ("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>
drivers/mfd/altera-sysmgr.c

index 5d3715a28b28e2fd3067f34ab2e69999350b4b19..dbe1009943718349a4867de375b4520bee404316 100644 (file)
@@ -110,7 +110,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);