diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-12-21 08:40:38 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-12-21 08:40:38 +1100 |
| commit | 3471bd2095e7fe737eb7d8ea40c928dbd4a84380 (patch) | |
| tree | 9c39800c86ba4a552eb12d6928eca9ed3604635b /net/bluetooth/af_bluetooth.c | |
| parent | 37662a70abcd76abf52d4bbe307649a1155525b5 (diff) | |
| parent | b75cfa1913c2890afc90d8d34ba8a63d1b4ba2af (diff) | |
Merge remote-tracking branch 'vfs/for-next'
Diffstat (limited to 'net/bluetooth/af_bluetooth.c')
| -rw-r--r-- | net/bluetooth/af_bluetooth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 91e3ba280706..671b907ba678 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c @@ -421,7 +421,7 @@ out: } EXPORT_SYMBOL(bt_sock_stream_recvmsg); -static inline unsigned int bt_accept_poll(struct sock *parent) +static inline __poll_t bt_accept_poll(struct sock *parent) { struct bt_sock *s, *n; struct sock *sk; @@ -437,11 +437,11 @@ static inline unsigned int bt_accept_poll(struct sock *parent) return 0; } -unsigned int bt_sock_poll(struct file *file, struct socket *sock, +__poll_t bt_sock_poll(struct file *file, struct socket *sock, poll_table *wait) { struct sock *sk = sock->sk; - unsigned int mask = 0; + __poll_t mask = 0; BT_DBG("sock %p, sk %p", sock, sk); |