Merge branch 'misc.poll' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / drivers / gpio / gpiolib.c

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 14532d9576e4239ff60a193bec13a1a819c338b8..5d6e8bb38ac717fe75e8eb10be6ac3ecbf7e8ee9 100644 (file)
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -604,11 +604,11 @@ struct lineevent_state {
        (GPIOEVENT_REQUEST_RISING_EDGE | \
        GPIOEVENT_REQUEST_FALLING_EDGE)
 
-static unsigned int lineevent_poll(struct file *filep,
+static __poll_t lineevent_poll(struct file *filep,
                                   struct poll_table_struct *wait)
 {
        struct lineevent_state *le = filep->private_data;
-       unsigned int events = 0;
+       __poll_t events = 0;
 
        poll_wait(filep, &le->wait, wait);