summaryrefslogtreecommitdiff
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorHuang, Tao <huangtao@rock-chips.com>2016-06-06 17:26:55 +0800
committerHuang, Tao <huangtao@rock-chips.com>2016-06-22 19:52:44 +0800
commit142baf7d610b0951d00f592ac82b04802f4ae977 (patch)
treedbfc5053eee8e0e19ecc9855daa13a191093ad75 /drivers/clocksource
parent7a73ecd2467442ff08977fb51423650216976904 (diff)
Revert "clocksource: rockchip: remove unnecessary clear irq before request_irq"
This reverts commit c380160aeae8b786868bd8483b9c1c9f22d15b61. Change-Id: I435f0989976627e9892ff2bdba91cf41b8b77ef9 Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/rockchip_timer.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/clocksource/rockchip_timer.c b/drivers/clocksource/rockchip_timer.c
index b93fed6533c6..b991b288c803 100644
--- a/drivers/clocksource/rockchip_timer.c
+++ b/drivers/clocksource/rockchip_timer.c
@@ -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);