summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2010-03-05 13:42:33 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-06 11:26:28 -0800
commitbe1494527c4dea4db87749d08b09be23327157dc (patch)
tree66b3fd4602185324a3e7a4c8234fb0d1b870925c /arch/cris
parentcda1c5af26a00ee31cdc5ab8321a1be7851cbfff (diff)
downloadop-kernel-dev-be1494527c4dea4db87749d08b09be23327157dc.zip
op-kernel-dev-be1494527c4dea4db87749d08b09be23327157dc.tar.gz
cris v32: typo in crisv32_arbiter_unwatch()?
With id 1 the wrong bp was unwatched. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Cc: Mikael Starvik <starvik@axis.com> Cc: Jesper Nilsson <jesper.nilsson@axis.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/arch-v32/mach-fs/arbiter.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/mach-fs/arbiter.c b/arch/cris/arch-v32/mach-fs/arbiter.c
index 84d31bd..82ef293 100644
--- a/arch/cris/arch-v32/mach-fs/arbiter.c
+++ b/arch/cris/arch-v32/mach-fs/arbiter.c
@@ -332,7 +332,7 @@ int crisv32_arbiter_unwatch(int id)
if (id == 0)
intr_mask.bp0 = regk_marb_no;
else if (id == 1)
- intr_mask.bp2 = regk_marb_no;
+ intr_mask.bp1 = regk_marb_no;
else if (id == 2)
intr_mask.bp2 = regk_marb_no;
else if (id == 3)
OpenPOWER on IntegriCloud