Merge tag 'staging-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-block.git] / drivers / staging / most / video / video.c

diff --git a/drivers/staging/most/video/video.c b/drivers/staging/most/video/video.c
index 098873851646b7e7ebb42b53700141dd23a083a4..ef23e8524b1e07143d77bdb5c682b627987193f0 100644 (file)
--- a/drivers/staging/most/video/video.c
+++ b/drivers/staging/most/video/video.c
@@ -203,11 +203,11 @@ static ssize_t comp_vdev_read(struct file *filp, char __user *buf,
        return ret;
 }
 
-static unsigned int comp_vdev_poll(struct file *filp, poll_table *wait)
+static __poll_t comp_vdev_poll(struct file *filp, poll_table *wait)
 {
        struct comp_fh *fh = filp->private_data;
        struct most_video_dev *mdev = fh->mdev;
-       unsigned int mask = 0;
+       __poll_t mask = 0;
 
        /* only wait if no data is available */
        if (!data_ready(mdev))