[PATCH] libertas: changed some occurences of kmalloc() + memset(&a,0,sz) to kzalloc()

The subject says it all.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 30f1d41a16d7..c1d9902cac5d 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -1482,28 +1482,24 @@ int libertas_allocate_cmd_buffer(wlan_private * priv)
         /* Allocate and initialize cmdCtrlNode */
         ulbufsize = sizeof(struct cmd_ctrl_node) * MRVDRV_NUM_OF_CMD_BUFFER;
 
-        if (!(tempcmd_array = kmalloc(ulbufsize, GFP_KERNEL))) {
+        if (!(tempcmd_array = kzalloc(ulbufsize, GFP_KERNEL))) {
                 lbs_deb_cmd(
                        "ALLOC_CMD_BUF: failed to allocate tempcmd_array\n");
                 ret = -1;
                 goto done;
         }
-
         adapter->cmd_array = tempcmd_array;
-        memset(adapter->cmd_array, 0, ulbufsize);
 
         /* Allocate and initialize command buffers */
         ulbufsize = MRVDRV_SIZE_OF_CMD_BUFFER;
         for (i = 0; i < MRVDRV_NUM_OF_CMD_BUFFER; i++) {
-                if (!(ptempvirtualaddr = kmalloc(ulbufsize, GFP_KERNEL))) {
+                if (!(ptempvirtualaddr = kzalloc(ulbufsize, GFP_KERNEL))) {
                         lbs_deb_cmd(
                                "ALLOC_CMD_BUF: ptempvirtualaddr: out of memory\n");
                         ret = -1;
                         goto done;
                 }
 
-                memset(ptempvirtualaddr, 0, ulbufsize);
-
                 /* Update command buffer virtual */
                 tempcmd_array[i].bufvirtualaddr = ptempvirtualaddr;
         }