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

[linux-2.6-block.git] / drivers / usb / class / usblp.c

diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index ca1d0ede41b52caec37dcfb1a0aa6760cc9e62ff..425247b7f7281dc41432ddae51d0c33f69b11e01 100644 (file)
--- a/drivers/usb/class/usblp.c
+++ b/drivers/usb/class/usblp.c
@@ -469,9 +469,9 @@ static int usblp_release(struct inode *inode, struct file *file)
 }
 
 /* No kernel lock - fine */
-static unsigned int usblp_poll(struct file *file, struct poll_table_struct *wait)
+static __poll_t usblp_poll(struct file *file, struct poll_table_struct *wait)
 {
-       int ret;
+       __poll_t ret;
        unsigned long flags;
 
        struct usblp *usblp = file->private_data;