---

yaml --- r: 285441 b: refs/heads/master c: d0d9748 h: refs/heads/master i: 285439: 3f73f14 v: v3
git-mirror · Dec 30, 2011 · 65e5c5c · 65e5c5c
1 parent 6e87eb4
commit 65e5c5c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;