summaryrefslogtreecommitdiff
path: root/drivers/clocksource/clksrc-of.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-12-10 20:47:22 +0100
committerIngo Molnar <mingo@kernel.org>2013-12-10 20:47:22 +0100
commit5d5119a476f77b57381ddd66d4f7034a5447480b (patch)
treef6bc77f6bcc06ee5582d6cf586e3dca5167063f3 /drivers/clocksource/clksrc-of.c
parent17b2112f332db7c2bac56926c9e627807bce3615 (diff)
parent9ab4727c1d41e50b67aecde4bf11879560a3ca78 (diff)
Merge branch 'clockevents/fixes' of git://git.linaro.org/people/daniel.lezcano/linux into timers/urgent
Pull clockevents/clocksource fixes from Daniel Lezcano: * Axel Lin added a missing dependency on CLKSRC_MMIO in the Kconfig for the time-efm32 * Dinh Nguyen fixed read_sched_clock to return the right value and added the clksrc-of missing definition for the dw_apb_timer * Ezequiel Garcia registered the sched clock after the counter, thus preventing time jump in the traces for the armada-370-xp * Marc Zyngier stopped the timer before enabling the irq in order to prevent it to be fired before the clockevent is registered for the sunxi * Thierry Reding removed a of_node_put in clksrc-of because the reference is not held 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, 0 insertions, 1 deletions
diff --git a/drivers/clocksource/clksrc-of.c b/drivers/clocksource/clksrc-of.c
index 35639cf4e5a2..b9ddd9e3a2f5 100644
--- a/drivers/clocksource/clksrc-of.c
+++ b/drivers/clocksource/clksrc-of.c
@@ -35,6 +35,5 @@ void __init clocksource_of_init(void)
init_func = match->data;
init_func(np);
- of_node_put(np);
}
}