Revert "clocksource: rockchip: remove unnecessary clear irq before request_irq"
authorHuang, Tao <huangtao@rock-chips.com>
Mon, 6 Jun 2016 09:26:55 +0000 (17:26 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Wed, 22 Jun 2016 11:52:44 +0000 (19:52 +0800)
This reverts commit c380160aeae8b786868bd8483b9c1c9f22d15b61.

Change-Id: I435f0989976627e9892ff2bdba91cf41b8b77ef9
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
drivers/clocksource/rockchip_timer.c

index b93fed6533c6f00683f91f45e36e4fdf1e7e0495..b991b288c8032740f4eb0a0a4a30d056fcbb6694 100644 (file)
@@ -158,6 +158,9 @@ static void __init rk_timer_init(struct device_node *np)
        ce->cpumask = cpumask_of(0);
        ce->rating = 250;
 
+       rk_timer_interrupt_clear(ce);
+       rk_timer_disable(ce);
+
        ret = request_irq(irq, rk_timer_interrupt, IRQF_TIMER, TIMER_NAME, ce);
        if (ret) {
                pr_err("Failed to initialize '%s': %d\n", TIMER_NAME, ret);