diff options
| author | Yongbae Park <yongbae2@gmail.com> | 2015-03-03 13:05:48 +0900 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-03-30 11:10:59 +0100 |
| commit | 724cfb0b6b5f4dc18a2567b7a5b5ef66bc750405 (patch) | |
| tree | 9fa8d45757a6b4e85b7d85c63ca7437921779993 /drivers/clocksource | |
| parent | fc28726d892f65d0eb55eb3328ee573deb2c3a26 (diff) | |
| download | linux-stable-724cfb0b6b5f4dc18a2567b7a5b5ef66bc750405.tar.gz linux-stable-724cfb0b6b5f4dc18a2567b7a5b5ef66bc750405.tar.bz2 linux-stable-724cfb0b6b5f4dc18a2567b7a5b5ef66bc750405.zip | |
clockevents: sun5i: Fix setup_irq init sequence
commit 1096be084ac59927158ce80ff1d31c33eed0e565 upstream.
The interrupt is enabled before the handler is set. Even this bug
did not appear, it is potentially dangerous as it can lead to a
NULL pointer dereference.
Fix the error by enabling the interrupt after
clockevents_config_and_register() is called.
Signed-off-by: Yongbae Park <yongbae2@gmail.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/timer-sun5i.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c index 02268448dc85..5dcbf90b8015 100644 --- a/drivers/clocksource/timer-sun5i.c +++ b/drivers/clocksource/timer-sun5i.c @@ -178,10 +178,6 @@ static void __init sun5i_timer_init(struct device_node *node) ticks_per_jiffy = DIV_ROUND_UP(rate, HZ); - ret = setup_irq(irq, &sun5i_timer_irq); - if (ret) - pr_warn("failed to setup irq %d\n", irq); - /* Enable timer0 interrupt */ val = readl(timer_base + TIMER_IRQ_EN_REG); writel(val | TIMER_IRQ_EN(0), timer_base + TIMER_IRQ_EN_REG); @@ -191,6 +187,10 @@ static void __init sun5i_timer_init(struct device_node *node) clockevents_config_and_register(&sun5i_clockevent, rate, TIMER_SYNC_TICKS, 0xffffffff); + + ret = setup_irq(irq, &sun5i_timer_irq); + if (ret) + pr_warn("failed to setup irq %d\n", irq); } CLOCKSOURCE_OF_DECLARE(sun5i_a13, "allwinner,sun5i-a13-hstimer", sun5i_timer_init); |