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

[linux-2.6-microblaze.git] / drivers / media / usb / gspca / gspca.c

diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c
index 1016497..87e18d0 100644 (file)
--- a/drivers/media/usb/gspca/gspca.c
+++ b/drivers/media/usb/gspca/gspca.c
@@ -1869,11 +1869,11 @@ out:
        return ret;
 }
 
-static unsigned int dev_poll(struct file *file, poll_table *wait)
+static __poll_t dev_poll(struct file *file, poll_table *wait)
 {
        struct gspca_dev *gspca_dev = video_drvdata(file);
-       unsigned long req_events = poll_requested_events(wait);
-       int ret = 0;
+       __poll_t req_events = poll_requested_events(wait);
+       __poll_t ret = 0;
 
        gspca_dbg(gspca_dev, D_FRAM, "poll\n");