diff options
| author | Mike Frysinger | 2011-04-04 17:20:50 +0200 |
|---|---|---|
| committer | Mike Frysinger | 2011-04-14 01:34:05 +0200 |
| commit | ce24ee468aabb7c499b910aa3c4ab3cb338326ed (patch) | |
| tree | bd0cc24eeb50867659709e2c2751934a4f35a8e2 /arch/blackfin | |
| parent | Blackfin: SMP: make all barriers handle cache issues (diff) | |
| download | kernel-qcow2-linux-ce24ee468aabb7c499b910aa3c4ab3cb338326ed.tar.gz kernel-qcow2-linux-ce24ee468aabb7c499b910aa3c4ab3cb338326ed.tar.xz kernel-qcow2-linux-ce24ee468aabb7c499b910aa3c4ab3cb338326ed.zip | |
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 cdbe075de1dc..8b81dc04488a 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); |