Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / net / irda / af_irda.c

diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index 8d2f7c9b491da5b7e7b13f90f2aa9c5d88f84faf..db639690c205540b5f443e25e08dca1bc8caf356 100644 (file)
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -845,9 +845,6 @@ static int irda_accept(struct socket *sock, struct socket *newsock, int flags)
        if (sock->state != SS_UNCONNECTED)
                goto out;
 
-       if ((sk = sock->sk) == NULL)
-               goto out;
-
        err = -EOPNOTSUPP;
        if ((sk->sk_type != SOCK_STREAM) && (sk->sk_type != SOCK_SEQPACKET) &&
            (sk->sk_type != SOCK_DGRAM))