From fd1848522d8f13c3066cf2bc6a79c0d66beae479 Mon Sep 17 00:00:00 2001 From: Fengguang Wu Date: Fri, 24 Aug 2012 23:27:35 +0800 Subject: [PATCH] --- yaml --- r: 328881 b: refs/heads/master c: 7731e6bb312ec8bb7892c465401dbc7119aea785 h: refs/heads/master i: 328879: e9b085b246e34b8fad56bc28e7c0624182d57a99 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/megaraid/megaraid_sas_fusion.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b047c503a1d7..3043e5070d82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9728686f17304bd682038664d9a1ad28b7409af8 +refs/heads/master: 7731e6bb312ec8bb7892c465401dbc7119aea785 diff --git a/trunk/drivers/scsi/megaraid/megaraid_sas_fusion.c b/trunk/drivers/scsi/megaraid/megaraid_sas_fusion.c index 788115b72b22..ddf094e7d0ac 100644 --- a/trunk/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/trunk/drivers/scsi/megaraid/megaraid_sas_fusion.c @@ -462,8 +462,8 @@ megasas_alloc_cmds_fusion(struct megasas_instance *instance) * Allocate the dynamic array first and then allocate individual * commands. */ - fusion->cmd_list = kmalloc(sizeof(struct megasas_cmd_fusion *) - *max_cmd, GFP_KERNEL); + fusion->cmd_list = kzalloc(sizeof(struct megasas_cmd_fusion *) + * max_cmd, GFP_KERNEL); if (!fusion->cmd_list) { printk(KERN_DEBUG "megasas: out of memory. Could not alloc " @@ -471,9 +471,6 @@ megasas_alloc_cmds_fusion(struct megasas_instance *instance) goto fail_cmd_list; } - memset(fusion->cmd_list, 0, sizeof(struct megasas_cmd_fusion *) - *max_cmd); - max_cmd = instance->max_fw_cmds; for (i = 0; i < max_cmd; i++) { fusion->cmd_list[i] = kmalloc(sizeof(struct megasas_cmd_fusion),