summaryrefslogtreecommitdiffstats
path: root/kernel/arch/powerpc/sysdev/cpm_common.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/arch/powerpc/sysdev/cpm_common.c')
-rw-r--r--kernel/arch/powerpc/sysdev/cpm_common.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/arch/powerpc/sysdev/cpm_common.c b/kernel/arch/powerpc/sysdev/cpm_common.c
index 4f7869571..e00a5ee58 100644
--- a/kernel/arch/powerpc/sysdev/cpm_common.c
+++ b/kernel/arch/powerpc/sysdev/cpm_common.c
@@ -147,7 +147,8 @@ unsigned long cpm_muram_alloc(unsigned long size, unsigned long align)
spin_lock_irqsave(&cpm_muram_lock, flags);
cpm_muram_info.alignment = align;
start = rh_alloc(&cpm_muram_info, size, "commproc");
- memset(cpm_muram_addr(start), 0, size);
+ if (!IS_ERR_VALUE(start))
+ memset_io(cpm_muram_addr(start), 0, size);
spin_unlock_irqrestore(&cpm_muram_lock, flags);
return start;