Patch "arm: mach-spear: Add missing of_node_put() in time.c" has been added to the 4.9-stable tree
Sasha Levin
AppliedThis is a note to let you know that I've just added the patch titled
arm: mach-spear: Add missing of_node_put() in time.c
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm-mach-spear-add-missing-of_node_put-in-time.c.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
commit 36321bb4ae4d9831fed71238b076d1eb4a8bba8e
Author: Liang He <[email protected]> Date: Thu Jun 16 17:30:27 2022 +0800
arm: mach-spear: Add missing of_node_put() in time.c
[ Upstream commit 2c629dd2d14fd7f64a553f809eda6d0b3a4f615a ]
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.
arch/arm/mach-spear/time.c +6 -2
@@ -223,13 +223,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 );
@@ -244,6 +244,8 @@ void __init spear_setup_of_timer(void) goto err_prepare_enable_clk; } +of_node_put (np); +spear_clockevent_init (irq);spear_clocksource_init ();
@@ -253,4 +255,6 @@ void __init spear_setup_of_timer(void)clk_put (gpt_clk); err_iomap:iounmap (gpt_base); +err_put_np: +of_node_put (np); }