In _init(), of_find_node_by_name() andof_get_next_child() will
return a node pointer with refcount incremented. We should use
of_node_put() in fail path or when it is not used anymore.
NOTE: As the ref will be passed from 'bus' to 'np' by the xx_lookup(),
in normal exit path, we should call of_node_put() at the end use of 'np',
not the end use of 'bus'.
Signed-off-by: Liang He <windhl@xxxxxxx>
---
changelog:
v3: add missing of_node_put() for of_get_xx based on tony's
advice
v2: merge similar bugs of omap2 into one commit
v1: fix missing of_node_put() for of_find_xx
arch/arm/mach-omap2/omap_hwmod.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 31d1a21f6041..c7f83bcac136 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -2365,6 +2365,7 @@ static int __init _init(struct omap_hwmod *oh, void *data)
r = _init_mpu_rt_base(oh, NULL, index, np);
if (r < 0) {
+ of_node_put(bus);
WARN(1, "omap_hwmod: %s: doesn't have mpu register target base\n",
oh->name);
return 0;
@@ -2372,6 +2373,7 @@ static int __init _init(struct omap_hwmod *oh, void *data)
r = _init_clocks(oh, np);
if (r < 0) {
+ of_node_put(bus);
WARN(1, "omap_hwmod: %s: couldn't init clocks\n", oh->name);
return -EINVAL;
}
@@ -2381,10 +2383,14 @@ static int __init _init(struct omap_hwmod *oh, void *data)
parse_module_flags(oh, np);
child = of_get_next_child(np, NULL);
- if (child)
+ if (child) {
parse_module_flags(oh, child);
+ of_node_put(child);
+ }
}
+ of_node_put(bus);
+
oh->_state = _HWMOD_STATE_INITIALIZED;
return 0;
@@ -3648,6 +3654,7 @@ static void __init omap_hwmod_setup_earlycon_flags(void)
np = of_find_node_by_path("/chosen");
if (np) {
uart = of_get_property(np, "stdout-path", NULL);
+ of_node_put(np);
if (uart) {
np = of_find_node_by_path(uart);
if (np) {
@@ -3661,6 +3668,7 @@ static void __init omap_hwmod_setup_earlycon_flags(void)
}
if (oh)
oh->flags |= DEBUG_OMAPUART_FLAGS;
+ of_node_put(np);
}
}
}
--
2.25.1
