]> Pileus Git - ~andy/linux/commitdiff
Blackfin: gptimers: fix thinko when disabling timers
authorMike Frysinger <vapier@gentoo.org>
Mon, 4 Apr 2011 15:20:50 +0000 (15:20 +0000)
committerMike Frysinger <vapier@gentoo.org>
Wed, 13 Apr 2011 23:34:05 +0000 (19:34 -0400)
We only want to clear the run bit for this one timer, not all status bits.
So don't read the whole reg and then write all the bits back out.

Reported-by: Isabelle Leonardi <i.leonardi@detracom.fr>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
arch/blackfin/kernel/gptimers.c

index cdbe075de1dc6841411310ef481ed26a4210c2f2..8b81dc04488aa6864aeb23236cadb65cc1cda676 100644 (file)
@@ -268,7 +268,7 @@ void disable_gptimers(uint16_t mask)
        _disable_gptimers(mask);
        for (i = 0; i < MAX_BLACKFIN_GPTIMERS; ++i)
                if (mask & (1 << i))
-                       group_regs[BFIN_TIMER_OCTET(i)]->status |= trun_mask[i];
+                       group_regs[BFIN_TIMER_OCTET(i)]->status = trun_mask[i];
        SSYNC();
 }
 EXPORT_SYMBOL(disable_gptimers);