Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc49cb21 authored by Li Zefan's avatar Li Zefan Committed by Russell King
Browse files

[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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1c016b2c

arch/arm/common/uengine.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -374,8 +374,8 @@ static int set_initial_registers(int uengine, struct ixp2000_uengine_code *c) 
	u8 *ucode;

	u8 *ucode;

	int i;

	int i;





	gpr_a = kmalloc(128 * sizeof(u32), GFP_KERNEL);

	gpr_a = kzalloc(128 * sizeof(u32), GFP_KERNEL);

	gpr_b = kmalloc(128 * sizeof(u32), GFP_KERNEL);

	gpr_b = kzalloc(128 * sizeof(u32), GFP_KERNEL);

	ucode = kmalloc(513 * 5, GFP_KERNEL);

	ucode = kmalloc(513 * 5, GFP_KERNEL);

	if (gpr_a == NULL || gpr_b == NULL || ucode == NULL) {

	if (gpr_a == NULL || gpr_b == NULL || ucode == NULL) {

		kfree(ucode);

		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)

	if (c->uengine_parameters & IXP2000_UENGINE_4_CONTEXTS)

		per_ctx_regs = 32;

		per_ctx_regs = 32;





	memset(gpr_a, 0, sizeof(gpr_a));

	memset(gpr_b, 0, sizeof(gpr_b));

	for (i = 0; i < 256; i++) {

	for (i = 0; i < 256; i++) {

		struct ixp2000_reg_value *r = c->initial_reg_values + i;

		struct ixp2000_reg_value *r = c->initial_reg_values + i;

		u32 *bank;

		u32 *bank;