From 5d79ed6b66cb0fe2c9f7331d524d278b8bc8888e Mon Sep 17 00:00:00 2001 From: Xi Wang Date: Fri, 6 Apr 2012 09:32:37 -0300 Subject: [PATCH] --- yaml --- r: 306163 b: refs/heads/master c: 0a3475eb618321013dab9ac744201ed09e8061f9 h: refs/heads/master i: 306161: a2edc65cdb5edaef1f0e5d6ae4e644bf90313c4c 306159: 8a4932d375759264c0844926f7acbc60cad91f1a v: v3 --- [refs] | 2 +- trunk/drivers/media/video/v4l2-ctrls.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 97d3823ad989..bc607c171d2b 100644 --- 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 index bf62b105b49d..1a71aa5fd458 100644 --- 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; }