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

[linux-2.6-microblaze.git] / drivers / tty / n_gsm.c

diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index db6728c..3b3af7e 100644 (file)
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -2468,10 +2468,10 @@ static ssize_t gsmld_write(struct tty_struct *tty, struct file *file,
  *     Called without the kernel lock held - fine
  */
 
-static unsigned int gsmld_poll(struct tty_struct *tty, struct file *file,
+static __poll_t gsmld_poll(struct tty_struct *tty, struct file *file,
                                                        poll_table *wait)
 {
-       unsigned int mask = 0;
+       __poll_t mask = 0;
        struct gsm_mux *gsm = tty->disc_data;
 
        poll_wait(file, &tty->read_wait, wait);