Merge tag 'char-misc-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[mirror_ubuntu-focal-kernel.git] / drivers / misc / mic / vop / vop_vringh.c

diff --git a/drivers/misc/mic/vop/vop_vringh.c b/drivers/misc/mic/vop/vop_vringh.c
index 27db64ec9efe5de4e38585234e7fbcb8b33d23e7..01d1f2ba7bb82116b7c11c3b0b50f408608c2b5d 100644 (file)
--- a/drivers/misc/mic/vop/vop_vringh.c
+++ b/drivers/misc/mic/vop/vop_vringh.c
@@ -1015,10 +1015,10 @@ __unlock_ret:
  * in the card->host (TX) path, when userspace is unblocked by poll it
  * must drain all available descriptors or it can stall.
  */
-static unsigned int vop_poll(struct file *f, poll_table *wait)
+static __poll_t vop_poll(struct file *f, poll_table *wait)
 {
        struct vop_vdev *vdev = f->private_data;
-       int mask = 0;
+       __poll_t mask = 0;
 
        mutex_lock(&vdev->vdev_mutex);
        if (vop_vdev_inited(vdev)) {