From 999f8ca6d3fa3a150b47802b7bea9b5857f64017 Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Mon, 24 Oct 2005 22:42:35 +0200 Subject: [PATCH] --- yaml --- r: 10821 b: refs/heads/master c: 46f116eab81b21c6ae8c4f169498c632b1f94bf1 h: refs/heads/master i: 10819: 78967b227f3372ca097f6220adc48e4b4b688a9b v: v3 --- [refs] | 2 +- trunk/drivers/usb/class/cdc-acm.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e4e204e8c86f..69b1fa527811 100644 --- 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 index 16ecad30e29c..1b4751412970 100644 --- 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);