From: Oliver Neukum <oliver@neukum.org>
Date: Mon, 24 Oct 2005 20:42:35 +0000 (+0200)
Subject: [PATCH] USB: cdc-acm patch to use kzalloc
X-Git-Tag: v2.6.15-rc1~731^2~16^2~1^2~20
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=46f116eab81b21c6ae8c4f169498c632b1f94bf1;p=~shefty%2Frdma-dev.git

[PATCH] USB: cdc-acm patch to use kzalloc

another one to use kzalloc. Please apply.

Signed-off-by: Oliver Neukum <oliver@neukum.name>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 16ecad30e29..1b475141297 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -827,11 +827,10 @@ skip_normal_probe:
 		return -ENODEV;
 	}
 
-	if (!(acm = kmalloc(sizeof(struct acm), GFP_KERNEL))) {
-		dev_dbg(&intf->dev, "out of memory (acm kmalloc)\n");
+	if (!(acm = kzalloc(sizeof(struct acm), GFP_KERNEL))) {
+		dev_dbg(&intf->dev, "out of memory (acm kzalloc)\n");
 		goto alloc_fail;
 	}
-	memset(acm, 0, sizeof(struct acm));
 
 	ctrlsize = le16_to_cpu(epctrl->wMaxPacketSize);
 	readsize = le16_to_cpu(epread->wMaxPacketSize);