diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-11-04 05:32:04 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-11-04 05:32:04 -0500 |
| commit | ca8888d7ae6fa18454c9e4f192c56bc6c8ca9b33 (patch) | |
| tree | c2b86b162f8fc2adf8a98f7e074500bee155d603 /net/nfc | |
| parent | db616173d787395787ecc93eef075fa975227b10 (diff) | |
| parent | a99d8080aaf358d5d23581244e5da23b35e340b9 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
to pick up the KVM fix which is required for the NX series.
Diffstat (limited to 'net/nfc')
| -rw-r--r-- | net/nfc/llcp_sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c index ccdd790e163a..28604414dec1 100644 --- a/net/nfc/llcp_sock.c +++ b/net/nfc/llcp_sock.c | |||
| @@ -554,11 +554,11 @@ static __poll_t llcp_sock_poll(struct file *file, struct socket *sock, | |||
| 554 | if (sk->sk_state == LLCP_LISTEN) | 554 | if (sk->sk_state == LLCP_LISTEN) |
| 555 | return llcp_accept_poll(sk); | 555 | return llcp_accept_poll(sk); |
| 556 | 556 | ||
| 557 | if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) | 557 | if (sk->sk_err || !skb_queue_empty_lockless(&sk->sk_error_queue)) |
| 558 | mask |= EPOLLERR | | 558 | mask |= EPOLLERR | |
| 559 | (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? EPOLLPRI : 0); | 559 | (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? EPOLLPRI : 0); |
| 560 | 560 | ||
| 561 | if (!skb_queue_empty(&sk->sk_receive_queue)) | 561 | if (!skb_queue_empty_lockless(&sk->sk_receive_queue)) |
| 562 | mask |= EPOLLIN | EPOLLRDNORM; | 562 | mask |= EPOLLIN | EPOLLRDNORM; |
| 563 | 563 | ||
| 564 | if (sk->sk_state == LLCP_CLOSED) | 564 | if (sk->sk_state == LLCP_CLOSED) |