From 0ac814f31296cf8059f09f9381623ef44fc56f9c Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 17 Sep 2010 21:30:05 -0700 Subject: [PATCH] [ARM] twd: Fix updating control register in set_mode Change-Id: I5096cc3fedf51024c332adbb846689e01e1f7ce0 Signed-off-by: Colin Cross --- arch/arm/kernel/smp_twd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c index a0db5474bdbe..c05e88a75354 100644 --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c @@ -32,7 +32,7 @@ static void twd_set_mode(enum clock_event_mode mode, struct clock_event_device *clk) { unsigned long ctrl = __raw_readl(twd_base + TWD_TIMER_CONTROL); - ctrl |= TWD_TIMER_CONTROL_PRESCALE_MASK; + ctrl &= TWD_TIMER_CONTROL_PRESCALE_MASK; switch (mode) { case CLOCK_EVT_MODE_PERIODIC: -- 2.34.1