Merge tag 'media/v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-2.6-block.git] / drivers / media / pci / zoran / zoran_driver.c

diff --git a/drivers/media/pci/zoran/zoran_driver.c b/drivers/media/pci/zoran/zoran_driver.c
index 10fefdf2f1e202cdb4ce2e5b78389db4c4f0403b..c464dae0389c9db2fb660dea899147a7451cc320 100644 (file)
--- a/drivers/media/pci/zoran/zoran_driver.c
+++ b/drivers/media/pci/zoran/zoran_driver.c
@@ -2501,13 +2501,13 @@ static int zoran_s_jpegcomp(struct file *file, void *__fh,
        return res;
 }
 
-static unsigned int
+static __poll_t
 zoran_poll (struct file *file,
            poll_table  *wait)
 {
        struct zoran_fh *fh = file->private_data;
        struct zoran *zr = fh->zr;
-       int res = v4l2_ctrl_poll(file, wait);
+       __poll_t res = v4l2_ctrl_poll(file, wait);
        int frame;
        unsigned long flags;