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 / meye / meye.c

diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c
index be860ec129b6ad60e4c7f2764bfd79bccdf7acc1..ae83293723bacfb31d1549b9dc375d2fdd873fbd 100644 (file)
--- a/drivers/media/pci/meye/meye.c
+++ b/drivers/media/pci/meye/meye.c
@@ -1423,9 +1423,9 @@ static long vidioc_default(struct file *file, void *fh, bool valid_prio,
 
 }
 
-static unsigned int meye_poll(struct file *file, poll_table *wait)
+static __poll_t meye_poll(struct file *file, poll_table *wait)
 {
-       unsigned int res = v4l2_ctrl_poll(file, wait);
+       __poll_t res = v4l2_ctrl_poll(file, wait);
 
        mutex_lock(&meye.lock);
        poll_wait(file, &meye.proc_list, wait);