From a5b05c799d735ce4e11ce4aa081d65403e6698bb Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Mon, 6 Oct 2008 12:54:57 -0700
Subject: [PATCH] --- yaml --- r: 110228 b: refs/heads/master c:
 859f4c74d8de4dc344b3a115367d5e22a79bddaf h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/net/netrom/af_netrom.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 179e1a747020..e71a1bab034f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33d1d2c52c3befa6c4df33b4ba58137d1c48894b
+refs/heads/master: 859f4c74d8de4dc344b3a115367d5e22a79bddaf
diff --git a/trunk/net/netrom/af_netrom.c b/trunk/net/netrom/af_netrom.c
index 532e4faa29f7..9f1ea4a27b35 100644
--- a/trunk/net/netrom/af_netrom.c
+++ b/trunk/net/netrom/af_netrom.c
@@ -525,6 +525,7 @@ static int nr_release(struct socket *sock)
 	if (sk == NULL) return 0;
 
 	sock_hold(sk);
+	sock_orphan(sk);
 	lock_sock(sk);
 	nr = nr_sk(sk);
 
@@ -548,7 +549,6 @@ static int nr_release(struct socket *sock)
 		sk->sk_state    = TCP_CLOSE;
 		sk->sk_shutdown |= SEND_SHUTDOWN;
 		sk->sk_state_change(sk);
-		sock_orphan(sk);
 		sock_set_flag(sk, SOCK_DESTROY);
 		break;