lkml.org 
[lkml]   [2022]   [Jun]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v3] arch: arm: mach-pxa: Add missing of_node_put in irq.c
Date
In pxa_dt_irq_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. This goto-label patch
style is advised by Daniel.

Signed-off-by: Liang He <windhl@126.com>
---
changelog:
v3: (1) use formal name (2) use -v N for format-patch (3) add
this changelog
v2: use goto-label patch style advised by Daniel
v1: add of_node_put in each fail path

arch/arm/mach-pxa/irq.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index 96f33ef1d9ea..5d7dd307013e 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -247,13 +247,13 @@ void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int))
&pxa_internal_irq_nr);
if (ret) {
pr_err("Not found marvell,intc-nr-irqs property\n");
- return;
+ goto out_put;
}

ret = of_address_to_resource(node, 0, &res);
if (ret < 0) {
pr_err("No registers defined for node\n");
- return;
+ goto out_put;
}
pxa_irq_base = io_p2v(res.start);

@@ -263,9 +263,12 @@ void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int))
ret = irq_alloc_descs(-1, 0, pxa_internal_irq_nr, 0);
if (ret < 0) {
pr_err("Failed to allocate IRQ numbers\n");
- return;
+ goto out_put;
}

pxa_init_irq_common(node, pxa_internal_irq_nr, fn);
+
+out_put:
+ of_node_put(node);
}
#endif /* CONFIG_OF */
--
2.25.1
\
 
 \ /
  Last update: 2022-06-15 13:50    [W:0.024 / U:1.504 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site