projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e0a5a6c
)
powerpc/mpic_msgr: fix offset error when setting mer register
author
Mingkai Hu
<Mingkai.hu@freescale.com>
Mon, 16 Apr 2012 02:05:07 +0000
(10:05 +0800)
committer
Kumar Gala
<galak@kernel.crashing.org>
Thu, 19 Apr 2012 19:55:56 +0000
(14:55 -0500)
Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
arch/powerpc/sysdev/mpic_msgr.c
patch
|
blob
|
history
diff --git
a/arch/powerpc/sysdev/mpic_msgr.c
b/arch/powerpc/sysdev/mpic_msgr.c
index
dc1cfe3
..
483d8fa
100644
(file)
--- a/
arch/powerpc/sysdev/mpic_msgr.c
+++ b/
arch/powerpc/sysdev/mpic_msgr.c
@@
-228,7
+228,7
@@
static __devinit int mpic_msgr_probe(struct platform_device *dev)
reg_number = block_number * MPIC_MSGR_REGISTERS_PER_BLOCK + i;
msgr->base = msgr_block_addr + i * MPIC_MSGR_STRIDE;
- msgr->mer =
msgr->base + MPIC_MSGR_MER_OFFSET
;
+ msgr->mer =
(u32 *)((u8 *)msgr->base + MPIC_MSGR_MER_OFFSET)
;
msgr->in_use = MSGR_FREE;
msgr->num = i;
raw_spin_lock_init(&msgr->lock);