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

[sfrench/cifs-2.6.git] / drivers / media / dvb-core / dmxdev.c

diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
index 5eada88414d1dc8d94503cb583253627e0946d01..bc198f84b9cd0d06e0af783331259b43802613c7 100644 (file)
--- a/drivers/media/dvb-core/dmxdev.c
+++ b/drivers/media/dvb-core/dmxdev.c
@@ -1173,10 +1173,10 @@ static long dvb_demux_ioctl(struct file *file, unsigned int cmd,
        return dvb_usercopy(file, cmd, arg, dvb_demux_do_ioctl);
 }
 
-static unsigned int dvb_demux_poll(struct file *file, poll_table *wait)
+static __poll_t dvb_demux_poll(struct file *file, poll_table *wait)
 {
        struct dmxdev_filter *dmxdevfilter = file->private_data;
-       unsigned int mask = 0;
+       __poll_t mask = 0;
 
        if ((!dmxdevfilter) || dmxdevfilter->dev->exit)
                return POLLERR;
@@ -1317,11 +1317,11 @@ static long dvb_dvr_ioctl(struct file *file,
        return dvb_usercopy(file, cmd, arg, dvb_dvr_do_ioctl);
 }
 
-static unsigned int dvb_dvr_poll(struct file *file, poll_table *wait)
+static __poll_t dvb_dvr_poll(struct file *file, poll_table *wait)
 {
        struct dvb_device *dvbdev = file->private_data;
        struct dmxdev *dmxdev = dvbdev->priv;
-       unsigned int mask = 0;
+       __poll_t mask = 0;
 #ifndef DVB_MMAP
        bool need_ringbuffer = false;
 #else