summaryrefslogtreecommitdiff
path: root/drivers/clocksource/clksrc-of.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-10-03 09:55:07 +0400
committerIngo Molnar <mingo@kernel.org>2013-10-03 09:57:02 +0400
commit68e90740284c69292881cd38c7ece6f09a18a58f (patch)
tree0b0793ae79a06e6e3bb9ae409f077eb6aabe5786 /drivers/clocksource/clksrc-of.c
parent19f29887a73e32c52171f2725ac2d7561adab62b (diff)
parent4fbcdc813fb9c0324fcff4c75414e717569d965e (diff)
downloadlinux-68e90740284c69292881cd38c7ece6f09a18a58f.tar.xz
Merge branch 'clockevents/3.13' of git://git.linaro.org/people/dlezcano/linux into timers/core
Pull (mostly) ARM clocksource driver updates from Daniel Lezcano: " - Soren Brinkmann added FEAT_PERCPU to a clock device when it is local per cpu. This feature prevents the clock framework to choose a per cpu timer as a broadcast timer. This problem arised when the ARM global timer is used when switching to the broadcast timer which is the case now on Xillinx with its cpuidle driver. - Stephen Boyd extended the generic sched_clock code to support 64bit counters and removes the setup_sched_clock deprecation, as that causes lots of warnings since there's still users in the arch/arm tree. He added also the CLOCK_SOURCE_SUSPEND_NONSTOP flag on the architected timer as they continue counting during suspend. - Uwe Kleine-König added some missing __init sections and consolidated the code by moving the of_node_put call from the drivers to the function clocksource_of_init. " Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/clocksource/clksrc-of.c')
-rw-r--r--drivers/clocksource/clksrc-of.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clocksource/clksrc-of.c b/drivers/clocksource/clksrc-of.c
index b9ddd9e3a2f5..35639cf4e5a2 100644
--- a/drivers/clocksource/clksrc-of.c
+++ b/drivers/clocksource/clksrc-of.c
@@ -35,5 +35,6 @@ void __init clocksource_of_init(void)
init_func = match->data;
init_func(np);
+ of_node_put(np);
}
}