1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index 347d50cd77d4..0433c41f9029 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -822,10 +822,9 @@ static int veth_init_connection(u8 rlp)
              || ! HvLpConfig_doLpsCommunicateOnVirtualLan(this_lp, rlp) )
                 return 0;
 
-        cnx = kmalloc(sizeof(*cnx), GFP_KERNEL);
+        cnx = kzalloc(sizeof(*cnx), GFP_KERNEL);
         if (! cnx)
                 return -ENOMEM;
-        memset(cnx, 0, sizeof(*cnx));
 
         cnx->remote_lp = rlp;
         spin_lock_init(&cnx->lock);
@@ -852,14 +851,13 @@ static int veth_init_connection(u8 rlp)
         if (rc != 0)
                 return rc;
 
-        msgs = kmalloc(VETH_NUMBUFFERS * sizeof(struct veth_msg), GFP_KERNEL);
+        msgs = kcalloc(VETH_NUMBUFFERS, sizeof(struct veth_msg), GFP_KERNEL);
         if (! msgs) {
                 veth_error("Can't allocate buffers for LPAR %d.\n", rlp);
                 return -ENOMEM;
         }
 
         cnx->msgs = msgs;
-        memset(msgs, 0, VETH_NUMBUFFERS * sizeof(struct veth_msg));
 
         for (i = 0; i < VETH_NUMBUFFERS; i++) {
                 msgs[i].token = i;