]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
[media] pvrusb2: Use kcalloc instead of kzalloc to allocate array
authorThomas Meyer <thomas@m3y3r.de>
Tue, 29 Nov 2011 20:08:00 +0000 (17:08 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 12 Dec 2011 16:51:11 +0000 (14:51 -0200)
The advantage of kcalloc is, that will prevent integer overflows which could
result from the multiplication of number of elements and size and it is also
a bit nicer to read.

The semantic patch that makes this change is available
in https://lkml.org/lkml/2011/11/25/107

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Acked-By: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/pvrusb2/pvrusb2-hdw.c

index 122b45760f0d9103306502e09e08c9d0b03002ae..ebc2c7e39233c1430df417492542d6769203e301 100644 (file)
@@ -2546,8 +2546,9 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
        }
 
        /* Define and configure additional controls from cx2341x module. */
-       hdw->mpeg_ctrl_info = kzalloc(
-               sizeof(*(hdw->mpeg_ctrl_info)) * MPEGDEF_COUNT, GFP_KERNEL);
+       hdw->mpeg_ctrl_info = kcalloc(MPEGDEF_COUNT,
+                                     sizeof(*(hdw->mpeg_ctrl_info)),
+                                     GFP_KERNEL);
        if (!hdw->mpeg_ctrl_info) goto fail;
        for (idx = 0; idx < MPEGDEF_COUNT; idx++) {
                cptr = hdw->controls + idx + CTRLDEF_COUNT;