diff options
-rw-r--r-- | net/irda/af_irda.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index eabd6838f50a..0eb7d596d470 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c | |||
@@ -138,7 +138,6 @@ static void irda_disconnect_indication(void *instance, void *sap, | |||
138 | sk->sk_shutdown |= SEND_SHUTDOWN; | 138 | sk->sk_shutdown |= SEND_SHUTDOWN; |
139 | 139 | ||
140 | sk->sk_state_change(sk); | 140 | sk->sk_state_change(sk); |
141 | sock_orphan(sk); | ||
142 | release_sock(sk); | 141 | release_sock(sk); |
143 | 142 | ||
144 | /* Close our TSAP. | 143 | /* Close our TSAP. |
@@ -1446,7 +1445,7 @@ static int irda_recvmsg_stream(struct kiocb *iocb, struct socket *sock, | |||
1446 | */ | 1445 | */ |
1447 | ret = sock_error(sk); | 1446 | ret = sock_error(sk); |
1448 | if (ret) | 1447 | if (ret) |
1449 | break; | 1448 | ; |
1450 | else if (sk->sk_shutdown & RCV_SHUTDOWN) | 1449 | else if (sk->sk_shutdown & RCV_SHUTDOWN) |
1451 | ; | 1450 | ; |
1452 | else if (noblock) | 1451 | else if (noblock) |