diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-17 12:36:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-17 12:36:26 -0800 |
| commit | 941ef73dbe337623e5eb3fd0a43bc1fc56082bb6 (patch) | |
| tree | d55d7e3d91f4acff186b1e592185006e9f151ce6 /drivers/clocksource/clksrc-of.c | |
| parent | dd0508093b79141e0044ca02f0acb6319f69f546 (diff) | |
| parent | 5d5119a476f77b57381ddd66d4f7034a5447480b (diff) | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Ingo Molnar:
"Five self-contained fixlets:
- fix clocksource driver build bug
- fix two sched_clock() bugs triggering on specific hardware
- fix devicetree enumeration bug affecting specific hardware
- fix irq handler registration race resulting in boot crash
- fix device node refcount bug"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource: dw_apb_timer_of: Fix support for dts binding "snps,dw-apb-timer"
clocksource: dw_apb_timer_of: Fix read_sched_clock
clocksource: sunxi: Stop timer from ticking before enabling interrupts
clocksource: clksrc-of: Do not drop unheld reference on device node
clocksource: armada-370-xp: Register sched_clock after the counter reset
clocksource: time-efm32: Select CLKSRC_MMIO
Diffstat (limited to 'drivers/clocksource/clksrc-of.c')
| -rw-r--r-- | drivers/clocksource/clksrc-of.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/clocksource/clksrc-of.c b/drivers/clocksource/clksrc-of.c index 35639cf4e5a..b9ddd9e3a2f 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); } } |