From 337031de707d4995879c72b27fa185f1038e72aa Mon Sep 17 00:00:00 2001 From: Xi Wang Date: Fri, 6 Apr 2012 09:32:36 -0300 Subject: [PATCH] --- yaml --- r: 306162 b: refs/heads/master c: 5f0049bd69b96537dc7c02755c169fb4ccca3ddf h: refs/heads/master 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 648e819d75e7..97d3823ad989 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30059d93b07a034555defbf14d689a279fd7368d +refs/heads/master: 5f0049bd69b96537dc7c02755c169fb4ccca3ddf diff --git a/trunk/drivers/media/video/v4l2-ctrls.c b/trunk/drivers/media/video/v4l2-ctrls.c index 3e0a72dec994..bf62b105b49d 100644 --- a/trunk/drivers/media/video/v4l2-ctrls.c +++ b/trunk/drivers/media/video/v4l2-ctrls.c @@ -2036,7 +2036,8 @@ int v4l2_g_ext_ctrls(struct v4l2_ctrl_handler *hdl, struct v4l2_ext_controls *cs 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 == NULL) return -ENOMEM; }