1 files changed, 1 insertions, 1 deletions

diff --git a/include/net/sock.h b/include/net/sock.h
index 04bc0b30e9e9..a6ba1f8871fd 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1854,7 +1854,7 @@ static inline bool wq_has_sleeper(struct socket_wq *wq)
 static inline void sock_poll_wait(struct file *filp,
                 wait_queue_head_t *wait_address, poll_table *p)
 {
-        if (p && wait_address) {
+        if (!poll_does_not_wait(p) && wait_address) {
                 poll_wait(filp, wait_address, p);
                 /*
                  * We need to be sure we are in sync with the