aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMingkai Hu <Mingkai.hu@freescale.com>2012-04-16 10:05:07 +0800
committerKumar Gala <galak@kernel.crashing.org>2012-04-19 14:55:56 -0500
commitdea58bd1cab8f6687a784cdacca242b6cac95ede (patch)
tree78d80844068dd3bbf5d6005447596e1ecdfc5a04
parente0a5a6c38190a5016bcb0f1267324a19b846a35a (diff)
downloadlinux-linaro-stable-dea58bd1cab8f6687a784cdacca242b6cac95ede.tar.gz
powerpc/mpic_msgr: fix offset error when setting mer register
Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r--arch/powerpc/sysdev/mpic_msgr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/mpic_msgr.c b/arch/powerpc/sysdev/mpic_msgr.c
index dc1cfe380070..483d8fa72e8b 100644
--- 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);