[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <173152924816.32228.1809322097420256013.tip-bot2@tip-bot2>
Date: Wed, 13 Nov 2024 20:20:48 -0000
From: "tip-bot2 for Javier Carrasco" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Javier Carrasco <javier.carrasco.cruz@...il.com>,
Daniel Lezcano <daniel.lezcano@...aro.org>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [tip: timers/core] clocksource/drivers/timer-ti-dm: Fix child node
refcount handling
The following commit has been merged into the timers/core branch of tip:
Commit-ID: e5cfc0989d9a2849c51c720a16b90b2c061a1aeb
Gitweb: https://git.kernel.org/tip/e5cfc0989d9a2849c51c720a16b90b2c061a1aeb
Author: Javier Carrasco <javier.carrasco.cruz@...il.com>
AuthorDate: Thu, 31 Oct 2024 13:54:23 +01:00
Committer: Daniel Lezcano <daniel.lezcano@...aro.org>
CommitterDate: Wed, 13 Nov 2024 13:49:33 +01:00
clocksource/drivers/timer-ti-dm: Fix child node refcount handling
of_find_compatible_node() increments the node's refcount, and it must be
decremented again with a call to of_node_put() when the pointer is no
longer required to avoid leaking the resource.
Instead of adding the missing calls to of_node_put() in all execution
paths, use the cleanup attribute for 'arm_timer' by means of the
__free() macro, which automatically calls of_node_put() when the
variable goes out of scope.
Fixes: 25de4ce5ed02 ("clocksource/drivers/timer-ti-dm: Handle dra7 timer wrap errata i940")
Signed-off-by: Javier Carrasco <javier.carrasco.cruz@...il.com>
Link: https://lore.kernel.org/r/20241031-timer-ti-dm-systimer-of_node_put-v3-1-063ee822b73a@gmail.com
Signed-off-by: Daniel Lezcano <daniel.lezcano@...aro.org>
---
drivers/clocksource/timer-ti-dm-systimer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/clocksource/timer-ti-dm-systimer.c b/drivers/clocksource/timer-ti-dm-systimer.c
index c2dcd8d..d1c144d 100644
--- a/drivers/clocksource/timer-ti-dm-systimer.c
+++ b/drivers/clocksource/timer-ti-dm-systimer.c
@@ -686,9 +686,9 @@ subsys_initcall(dmtimer_percpu_timer_startup);
static int __init dmtimer_percpu_quirk_init(struct device_node *np, u32 pa)
{
- struct device_node *arm_timer;
+ struct device_node *arm_timer __free(device_node) =
+ of_find_compatible_node(NULL, NULL, "arm,armv7-timer");
- arm_timer = of_find_compatible_node(NULL, NULL, "arm,armv7-timer");
if (of_device_is_available(arm_timer)) {
pr_warn_once("ARM architected timer wrap issue i940 detected\n");
return 0;
Powered by blists - more mailing lists