diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-04-04 15:20:50 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-04-13 19:34:05 -0400 |
| commit | ce24ee468aabb7c499b910aa3c4ab3cb338326ed (patch) | |
| tree | bd0cc24eeb50867659709e2c2751934a4f35a8e2 /arch/blackfin | |
| parent | 943aee0c685d0563228d5a2ad9c8394ad0300fb5 (diff) | |
| download | kernel_samsung_aries-ce24ee468aabb7c499b910aa3c4ab3cb338326ed.zip kernel_samsung_aries-ce24ee468aabb7c499b910aa3c4ab3cb338326ed.tar.gz kernel_samsung_aries-ce24ee468aabb7c499b910aa3c4ab3cb338326ed.tar.bz2 | |
Blackfin: gptimers: fix thinko when disabling timers
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>
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/kernel/gptimers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/gptimers.c b/arch/blackfin/kernel/gptimers.c index cdbe075..8b81dc0 100644 --- a/arch/blackfin/kernel/gptimers.c +++ b/arch/blackfin/kernel/gptimers.c @@ -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); |