diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-26 19:43:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-26 19:43:20 -0800 |
| commit | 24e55910e4801d772f95becde20b526b8b10388d (patch) | |
| tree | fe02c8e39d21e940562624e95fbe6641a590e734 /drivers | |
| parent | dcad0fceae528e8007610308bad7e5a3370e5c39 (diff) | |
| parent | 00f4e13c4634b10f6a16b26a980b22a53dfa6bb5 (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.
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource : Nomadik-mtu : fix missing irq initialization
posix-timer: Don't call idr_find() with out-of-range ID
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clocksource/nomadik-mtu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clocksource/nomadik-mtu.c b/drivers/clocksource/nomadik-mtu.c index 435e54d55bb..071f6eadfea 100644 --- a/drivers/clocksource/nomadik-mtu.c +++ b/drivers/clocksource/nomadik-mtu.c @@ -240,6 +240,7 @@ void __init nmdk_timer_init(void __iomem *base, int irq) /* Timer 1 is used for events, register irq and clockevents */ setup_irq(irq, &nmdk_timer_irq); nmdk_clkevt.cpumask = cpumask_of(0); + nmdk_clkevt.irq = irq; clockevents_config_and_register(&nmdk_clkevt, rate, 2, 0xffffffffU); mtu_delay_timer.read_current_timer = &nmdk_timer_read_current_timer; |