From 711ad75f18997665cbccd5d510506a4b81e1abf7 Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Thu, 17 Nov 2011 12:43:40 +0000
Subject: [PATCH] --- yaml --- r: 277921 b: refs/heads/master c:
 c796984f2f1c528ac21220808525440d49413f8c h: refs/heads/master i:   277919:
 d4559c2f5f79264d6e3086e4c06c95c4c43f2e7e v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/usb/cdc_ncm.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index af67e395a38d..72e3cde28f06 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26bff940dd975499c6c47438d4395d7d215911e8
+refs/heads/master: c796984f2f1c528ac21220808525440d49413f8c
diff --git a/trunk/drivers/net/usb/cdc_ncm.c b/trunk/drivers/net/usb/cdc_ncm.c
index f06fb78383a1..009dd0f18535 100644
--- a/trunk/drivers/net/usb/cdc_ncm.c
+++ b/trunk/drivers/net/usb/cdc_ncm.c
@@ -465,12 +465,10 @@ static int cdc_ncm_bind(struct usbnet *dev, struct usb_interface *intf)
 	int temp;
 	u8 iface_no;
 
-	ctx = kmalloc(sizeof(*ctx), GFP_KERNEL);
+	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
 	if (ctx == NULL)
 		return -ENODEV;
 
-	memset(ctx, 0, sizeof(*ctx));
-
 	init_timer(&ctx->tx_timer);
 	spin_lock_init(&ctx->mtx);
 	ctx->netdev = dev->net;