From 26531c48e61f7aea2b763c4051aff9f6207aff7f Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oliver@neukum.org>
Date: Fri, 6 Jan 2006 21:35:08 +0100
Subject: [PATCH] --- yaml --- r: 22027 b: refs/heads/master c:
 51b208ddf6e492c58609e07fa50bce98bb02cb27 h: refs/heads/master i:   22025:
 927d9d8b07fd0809771348ebd8c0460dfc243711   22023:
 1c84ec57017e57d59e513359c14180a641c6fb64 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/usb/media/usbvideo.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b1af897e9ccf..1458ee7c81b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b10b4177881c50f22a79832558054f2e42be5cfa
+refs/heads/master: 51b208ddf6e492c58609e07fa50bce98bb02cb27
diff --git a/trunk/drivers/usb/media/usbvideo.c b/trunk/drivers/usb/media/usbvideo.c
index 63a72e550a1b..63d279ec722b 100644
--- a/trunk/drivers/usb/media/usbvideo.c
+++ b/trunk/drivers/usb/media/usbvideo.c
@@ -690,14 +690,13 @@ int usbvideo_register(
 	}
 
 	base_size = num_cams * sizeof(struct uvd) + sizeof(struct usbvideo);
-	cams = (struct usbvideo *) kmalloc(base_size, GFP_KERNEL);
+	cams = (struct usbvideo *) kzalloc(base_size, GFP_KERNEL);
 	if (cams == NULL) {
 		err("Failed to allocate %d. bytes for usbvideo struct", base_size);
 		return -ENOMEM;
 	}
 	dbg("%s: Allocated $%p (%d. bytes) for %d. cameras",
 	    __FUNCTION__, cams, base_size, num_cams);
-	memset(cams, 0, base_size);
 
 	/* Copy callbacks, apply defaults for those that are not set */
 	memmove(&cams->cb, cbTbl, sizeof(cams->cb));