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

[linux-2.6-microblaze.git] / drivers / media / radio / radio-si476x.c

diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
index d1355ac..bff9789 100644 (file)
--- a/drivers/media/radio/radio-si476x.c
+++ b/drivers/media/radio/radio-si476x.c
@@ -1151,12 +1151,12 @@ static ssize_t si476x_radio_fops_read(struct file *file, char __user *buf,
        return rval;
 }
 
-static unsigned int si476x_radio_fops_poll(struct file *file,
+static __poll_t si476x_radio_fops_poll(struct file *file,
                                struct poll_table_struct *pts)
 {
        struct si476x_radio *radio = video_drvdata(file);
-       unsigned long req_events = poll_requested_events(pts);
-       unsigned int err = v4l2_ctrl_poll(file, pts);
+       __poll_t req_events = poll_requested_events(pts);
+       __poll_t err = v4l2_ctrl_poll(file, pts);
 
        if (req_events & (POLLIN | POLLRDNORM)) {
                if (atomic_read(&radio->core->is_alive))