Merge tag 'for-linus-20180616' of git://git.kernel.dk/linux-block

[linux.git] / drivers / media / usb / stkwebcam / stk-webcam.c

diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c b/drivers/media/usb/stkwebcam/stk-webcam.c
index 17ad978c01726fc801c24c05199cbdfa792e95b2..5accb52410720196b24181e18ee0620e68dbc223 100644 (file)
--- a/drivers/media/usb/stkwebcam/stk-webcam.c
+++ b/drivers/media/usb/stkwebcam/stk-webcam.c
@@ -567,8 +567,9 @@ static int stk_prepare_sio_buffers(struct stk_camera *dev, unsigned n_sbufs)
        if (dev->sio_bufs != NULL)
                pr_err("sio_bufs already allocated\n");
        else {
-               dev->sio_bufs = kzalloc(n_sbufs * sizeof(struct stk_sio_buffer),
-                               GFP_KERNEL);
+               dev->sio_bufs = kcalloc(n_sbufs,
+                                       sizeof(struct stk_sio_buffer),
+                                       GFP_KERNEL);
                if (dev->sio_bufs == NULL)
                        return -ENOMEM;
                for (i = 0; i < n_sbufs; i++) {
@@ -729,10 +730,10 @@ static __poll_t v4l_stk_poll(struct file *fp, poll_table *wait)
        poll_wait(fp, &dev->wait_frame, wait);
 
        if (!is_present(dev))
-               return POLLERR;
+               return EPOLLERR;
 
        if (!list_empty(&dev->sio_full))
-               return res | POLLIN | POLLRDNORM;
+               return res | EPOLLIN | EPOLLRDNORM;
 
        return res;
 }