Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[~andy/linux] / drivers / media / video / stk-webcam.c

diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index 3c61aec517ac3d4edcd6ea1a07a5c36dc9bd6f46..d427f8436c70468721140d655eb00196d9ccf80b 100644 (file)
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -377,8 +377,8 @@ static int stk_prepare_iso(struct stk_camera *dev)
        if (dev->isobufs)
                STK_ERROR("isobufs already allocated. Bad\n");
        else
-               dev->isobufs = kzalloc(MAX_ISO_BUFS * sizeof(*dev->isobufs),
-                                       GFP_KERNEL);
+               dev->isobufs = kcalloc(MAX_ISO_BUFS, sizeof(*dev->isobufs),
+                                      GFP_KERNEL);
        if (dev->isobufs == NULL) {
                STK_ERROR("Unable to allocate iso buffers\n");
                return -ENOMEM;