git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'wireless-drivers-for-davem-2018-10-01' of git://git.kernel.org/pub/scm...
[sfrench/cifs-2.6.git]
/
net
/
nfc
/
llcp_sock.c
diff --git
a/net/nfc/llcp_sock.c
b/net/nfc/llcp_sock.c
index ea0c0c6f187429426f4849347c09b847f0111fff..dd4adf8b1167ed61bfcbdba3df7164b4b98dc98a 100644
(file)
--- a/
net/nfc/llcp_sock.c
+++ b/
net/nfc/llcp_sock.c
@@
-556,7
+556,7
@@
static __poll_t llcp_sock_poll(struct file *file, struct socket *sock,
pr_debug("%p\n", sk);
- sock_poll_wait(file,
sk_sleep(sk),
wait);
+ sock_poll_wait(file, wait);
if (sk->sk_state == LLCP_LISTEN)
return llcp_accept_poll(sk);