[PATCH v2] arm: mm: (cache-feroceon-l2) Add missing of_node_put()

Liang He
2022-06-16T03:03:04Z

In feroceon_of_init(), of_find_matching_node() will return a node
pointer with refcount incremented. We should use of_node_put() in
fail path or when it is not used anymore.

Signed-off-by: Liang He <windhl@126.com>
---
changelog:
v2: (1) use real name (2) fix errors reported by with scritps/checkpatch.pl
(3) use goto-label patch style
v1: add of_node_put() in fail path

arch/arm/mm/cache-feroceon-l2.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mm/cache-feroceon-l2.c b/arch/arm/mm/cache-feroceon-l2.c
index 5c1b7a7b9af6..ff17b7df4b09 100644
--- a/arch/arm/mm/cache-feroceon-l2.c
+++ b/arch/arm/mm/cache-feroceon-l2.c
@@ -368,6 +368,7 @@ int __init feroceon_of_init(void)
struct device_node *node;
void __iomem *base;
bool l2_wt_override = false;
+ int ret;

#if defined(CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH)
l2_wt_override = true;
@@ -376,8 +377,10 @@ int __init feroceon_of_init(void)
node = of_find_matching_node(NULL, feroceon_ids);
if (node && of_device_is_compatible(node, "marvell,kirkwood-cache")) {
base = of_iomap(node, 0);
- if (!base)
- return -ENOMEM;
+ if (!base) {
+ ret = -ENOMEM;
+ goto out_put;
+ }

if (l2_wt_override)
writel(readl(base) | L2_WRITETHROUGH_KIRKWOOD, base);
@@ -386,7 +389,10 @@ int __init feroceon_of_init(void)
}

feroceon_l2_init(l2_wt_override);
+ ret = 0;

- return 0;
+output:
+ of_node_put(node);
+ return ret;
}
#endif
--
2.25.1