Merge tag 'arc-4.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[sfrench/cifs-2.6.git] / drivers / media / usb / stk1160 / stk1160-video.c

diff --git a/drivers/media/usb/stk1160/stk1160-video.c b/drivers/media/usb/stk1160/stk1160-video.c
index 423c03a0638dfbc6bbd69b567b8ebded117cf89d..2811f612820fc1b2c1f6db64fa744daf165f2083 100644 (file)
--- a/drivers/media/usb/stk1160/stk1160-video.c
+++ b/drivers/media/usb/stk1160/stk1160-video.c
@@ -439,14 +439,14 @@ int stk1160_alloc_isoc(struct stk1160 *dev)
 
        dev->isoc_ctl.buf = NULL;
        dev->isoc_ctl.max_pkt_size = dev->max_pkt_size;
-       dev->isoc_ctl.urb = kzalloc(sizeof(void *)*num_bufs, GFP_KERNEL);
+       dev->isoc_ctl.urb = kcalloc(num_bufs, sizeof(void *), GFP_KERNEL);
        if (!dev->isoc_ctl.urb) {
                stk1160_err("out of memory for urb array\n");
                return -ENOMEM;
        }
 
-       dev->isoc_ctl.transfer_buffer = kzalloc(sizeof(void *)*num_bufs,
-                                             GFP_KERNEL);
+       dev->isoc_ctl.transfer_buffer = kcalloc(num_bufs, sizeof(void *),
+                                               GFP_KERNEL);
        if (!dev->isoc_ctl.transfer_buffer) {
                stk1160_err("out of memory for usb transfers\n");
                kfree(dev->isoc_ctl.urb);