Merge commit 'jwb/next' into next

[linux-drm-fsl-dcu.git] / net / phonet / socket.c

diff --git a/net/phonet/socket.c b/net/phonet/socket.c
index c785bfd0744f149b753506f8f2f754329410f8ad..6e9848bf0370dff4a78827839a9a1057e52fb2b0 100644 (file)
--- a/net/phonet/socket.c
+++ b/net/phonet/socket.c
@@ -265,7 +265,7 @@ static unsigned int pn_socket_poll(struct file *file, struct socket *sock,
        struct pep_sock *pn = pep_sk(sk);
        unsigned int mask = 0;
 
-       poll_wait(file, &sock->wait, wait);
+       poll_wait(file, sk_sleep(sk), wait);
 
        switch (sk->sk_state) {
        case TCP_LISTEN: