From 65e5c5cd803ec909c97cfccff9164084c9c59e24 Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Tue, 29 Nov 2011 17:08:00 -0300
Subject: [PATCH] --- yaml --- r: 285441 b: refs/heads/master c:
 d0d97488dd1e8131ac9d8f7d3487c355f4bf9d72 h: refs/heads/master i:   285439:
 3f73f14a5337acf107275770d7cb6b32ea9d79e5 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/video/uvc/uvc_ctrl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3b8523b0d0fb..65f015d3db76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 505b534d9611023a5fcd6010c4366d5cb884d751
+refs/heads/master: d0d97488dd1e8131ac9d8f7d3487c355f4bf9d72
diff --git a/trunk/drivers/media/video/uvc/uvc_ctrl.c b/trunk/drivers/media/video/uvc/uvc_ctrl.c
index 3e849d977bd4..0efd3b10b353 100644
--- a/trunk/drivers/media/video/uvc/uvc_ctrl.c
+++ b/trunk/drivers/media/video/uvc/uvc_ctrl.c
@@ -1874,7 +1874,7 @@ int uvc_ctrl_init_device(struct uvc_device *dev)
 		if (ncontrols == 0)
 			continue;
 
-		entity->controls = kzalloc(ncontrols * sizeof(*ctrl),
+		entity->controls = kcalloc(ncontrols, sizeof(*ctrl),
 					   GFP_KERNEL);
 		if (entity->controls == NULL)
 			return -ENOMEM;