| Message ID | 20220616093027.3984903-1-windhl@126.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2c629dd2d14fd7f64a553f809eda6d0b3a4f615a |
| Headers | show |
| Series | [v2] arm: mach-spear: Add missing of_node_put() in time.c | expand |
On 16-06-22, 17:30, Liang He wrote: > In spear_setup_of_timer(), of_find_matching_node() will return a > node pointer with refcount incrementd. We should use of_node_put() > in each fail path or when it is not used anymore. > > Signed-off-by: Liang He <windhl@126.com> > --- > changelog: > > v2: use goto-label patch style suggested by Viresh. > v1: use plain of_node_put in each fail path. > > arch/arm/mach-spear/time.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c > index d1fdb6066f7b..c7c17c0f936c 100644 > --- a/arch/arm/mach-spear/time.c > +++ b/arch/arm/mach-spear/time.c > @@ -218,13 +218,13 @@ void __init spear_setup_of_timer(void) > irq = irq_of_parse_and_map(np, 0); > if (!irq) { > pr_err("%s: No irq passed for timer via DT\n", __func__); > - return; > + goto err_put_np; > } > > gpt_base = of_iomap(np, 0); > if (!gpt_base) { > pr_err("%s: of iomap failed\n", __func__); > - return; > + goto err_put_np; > } > > gpt_clk = clk_get_sys("gpt0", NULL); > @@ -239,6 +239,8 @@ void __init spear_setup_of_timer(void) > goto err_prepare_enable_clk; > } > > + of_node_put(np); > + > spear_clockevent_init(irq); > spear_clocksource_init(); > > @@ -248,4 +250,6 @@ void __init spear_setup_of_timer(void) > clk_put(gpt_clk); > err_iomap: > iounmap(gpt_base); > +err_put_np: > + of_node_put(np); > } Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Hello: This patch was applied to soc/soc.git (arm/fixes) by Arnd Bergmann <arnd@arndb.de>: On Thu, 16 Jun 2022 17:30:27 +0800 you wrote: > In spear_setup_of_timer(), of_find_matching_node() will return a > node pointer with refcount incrementd. We should use of_node_put() > in each fail path or when it is not used anymore. > > Signed-off-by: Liang He <windhl@126.com> > --- > changelog: > > [...] Here is the summary with links: - [v2] arm: mach-spear: Add missing of_node_put() in time.c https://git.kernel.org/soc/soc/c/2c629dd2d14f You are awesome, thank you!
diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c index d1fdb6066f7b..c7c17c0f936c 100644 --- a/arch/arm/mach-spear/time.c +++ b/arch/arm/mach-spear/time.c @@ -218,13 +218,13 @@ void __init spear_setup_of_timer(void) irq = irq_of_parse_and_map(np, 0); if (!irq) { pr_err("%s: No irq passed for timer via DT\n", __func__); - return; + goto err_put_np; } gpt_base = of_iomap(np, 0); if (!gpt_base) { pr_err("%s: of iomap failed\n", __func__); - return; + goto err_put_np; } gpt_clk = clk_get_sys("gpt0", NULL); @@ -239,6 +239,8 @@ void __init spear_setup_of_timer(void) goto err_prepare_enable_clk; } + of_node_put(np); + spear_clockevent_init(irq); spear_clocksource_init(); @@ -248,4 +250,6 @@ void __init spear_setup_of_timer(void) clk_put(gpt_clk); err_iomap: iounmap(gpt_base); +err_put_np: + of_node_put(np); }
In spear_setup_of_timer(), of_find_matching_node() will return a node pointer with refcount incrementd. We should use of_node_put() in each fail path or when it is not used anymore. Signed-off-by: Liang He <windhl@126.com> --- changelog: v2: use goto-label patch style suggested by Viresh. v1: use plain of_node_put in each fail path. arch/arm/mach-spear/time.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)