diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-11-20 21:46:04 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-11-20 21:46:04 +0100 |
| commit | a69862d8d04e4877965cc938140c9f8e6da0b827 (patch) | |
| tree | 667cace5c2fad872871e4d24d0c895664f0e0bc6 /net/irda | |
| parent | 0f32fd1900e6b972f289416dbd75e92772b630cb (diff) | |
| parent | 01cb156edbbd4e6c4fd8db0d05f18c62c424f9aa (diff) | |
| download | blackbird-op-linux-a69862d8d04e4877965cc938140c9f8e6da0b827.tar.gz blackbird-op-linux-a69862d8d04e4877965cc938140c9f8e6da0b827.zip | |
Merge branch 'for-linus' into test/usb-resume
Diffstat (limited to 'net/irda')
| -rw-r--r-- | net/irda/af_irda.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index 92fafd485deb..3f3a6cbdceb7 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -1064,8 +1064,6 @@ static int irda_connect(struct socket *sock, struct sockaddr *uaddr, if (sk->sk_state != TCP_ESTABLISHED) { sock->state = SS_UNCONNECTED; - if (sk->sk_prot->disconnect(sk, flags)) - sock->state = SS_DISCONNECTING; err = sock_error(sk); if (!err) err = -ECONNRESET; |
