[ARM] twd: Fix updating control register in set_mode
authorColin Cross <ccross@android.com>
Sat, 18 Sep 2010 04:30:05 +0000 (21:30 -0700)
committerColin Cross <ccross@android.com>
Wed, 6 Oct 2010 23:28:43 +0000 (16:28 -0700)
Change-Id: I5096cc3fedf51024c332adbb846689e01e1f7ce0
Signed-off-by: Colin Cross <ccross@android.com>
arch/arm/kernel/smp_twd.c

index a0db5474bdbe7cd44715d9f9ff68e4344c69f1dd..c05e88a753544d00549070018c66b414c606bcf9 100644 (file)
@@ -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: