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

[linux-2.6-block.git] / block / bsg.c

diff --git a/block/bsg.c b/block/bsg.c
index a1bcbb6ba50b5979b2791f37566fb07045dca112..2e2c1e222209724630949ade3de4b3efa321b557 100644 (file)
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -839,10 +839,10 @@ static int bsg_release(struct inode *inode, struct file *file)
        return bsg_put_device(bd);
 }
 
-static unsigned int bsg_poll(struct file *file, poll_table *wait)
+static __poll_t bsg_poll(struct file *file, poll_table *wait)
 {
        struct bsg_device *bd = file->private_data;
-       unsigned int mask = 0;
+       __poll_t mask = 0;
 
        poll_wait(file, &bd->wq_done, wait);
        poll_wait(file, &bd->wq_free, wait);