---

yaml --- r: 10821 b: refs/heads/master c: 46f116e h: refs/heads/master i: 10819: 78967b2 v: v3
git-mirror · Oct 28, 2005 · 999f8ca · 999f8ca
1 parent 7c67b8c
commit 999f8ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb3c5ed8617d0aa67648cb7d1a486d14099129f2
+refs/heads/master: 46f116eab81b21c6ae8c4f169498c632b1f94bf1
diff --git a/trunk/drivers/usb/class/cdc-acm.c b/trunk/drivers/usb/class/cdc-acm.c
@@ -827,11 +827,10 @@ static int acm_probe (struct usb_interface *intf,
 		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);