---

yaml --- r: 306163 b: refs/heads/master c: 0a3475e h: refs/heads/master i: 306161: a2edc65 306159: 8a4932d v: v3
git-mirror · Apr 18, 2012 · 5d79ed6 · 5d79ed6
1 parent 337031d
commit 5d79ed6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f0049bd69b96537dc7c02755c169fb4ccca3ddf
+refs/heads/master: 0a3475eb618321013dab9ac744201ed09e8061f9
diff --git a/trunk/drivers/media/video/v4l2-ctrls.c b/trunk/drivers/media/video/v4l2-ctrls.c
@@ -2259,7 +2259,8 @@ static int try_set_ext_ctrls(struct v4l2_fh *fh, struct v4l2_ctrl_handler *hdl,
 		return class_check(hdl, cs->ctrl_class);
 
 	if (cs->count > ARRAY_SIZE(helper)) {
-		helpers = kmalloc(sizeof(helper[0]) * cs->count, GFP_KERNEL);
+		helpers = kmalloc_array(cs->count, sizeof(helper[0]),
+					GFP_KERNEL);
 		if (!helpers)
 			return -ENOMEM;
 	}