diff options
author | Li Zefan <lizf@cn.fujitsu.com> | 2007-11-21 14:51:50 -0800 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-11-26 19:43:40 +0000 |
commit | dc49cb21801db1f89d74b01a0f38f200aebb3e43 (patch) | |
tree | 2fedef6ebfa0c896774be5dadae614d258b7d5ff /arch/arm/common | |
parent | 1c016b2c728b2ecbdd4088bd42e556fd29065cc5 (diff) | |
download | blackbird-op-linux-dc49cb21801db1f89d74b01a0f38f200aebb3e43.tar.gz blackbird-op-linux-dc49cb21801db1f89d74b01a0f38f200aebb3e43.zip |
[ARM] uengine: fix memset size error
The size passing to memset is wrong. And here we can replace kmalloc with
kzalloc.
Signed-off-by Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/common')
-rw-r--r-- | arch/arm/common/uengine.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/common/uengine.c b/arch/arm/common/uengine.c index 95c8508c29b7..117cab30bd36 100644 --- a/arch/arm/common/uengine.c +++ b/arch/arm/common/uengine.c @@ -374,8 +374,8 @@ static int set_initial_registers(int uengine, struct ixp2000_uengine_code *c) u8 *ucode; int i; - gpr_a = kmalloc(128 * sizeof(u32), GFP_KERNEL); - gpr_b = kmalloc(128 * sizeof(u32), GFP_KERNEL); + gpr_a = kzalloc(128 * sizeof(u32), GFP_KERNEL); + gpr_b = kzalloc(128 * sizeof(u32), GFP_KERNEL); ucode = kmalloc(513 * 5, GFP_KERNEL); if (gpr_a == NULL || gpr_b == NULL || ucode == NULL) { kfree(ucode); @@ -388,8 +388,6 @@ static int set_initial_registers(int uengine, struct ixp2000_uengine_code *c) if (c->uengine_parameters & IXP2000_UENGINE_4_CONTEXTS) per_ctx_regs = 32; - memset(gpr_a, 0, sizeof(gpr_a)); - memset(gpr_b, 0, sizeof(gpr_b)); for (i = 0; i < 256; i++) { struct ixp2000_reg_value *r = c->initial_reg_values + i; u32 *bank; |