diff --git a/[refs] b/[refs]
index 748dc2097e0c..a7d12f03f4fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97dc875f90a7b88a9fa476c256345c0d40fcdf6c
+refs/heads/master: 7dfde179c38056b91d51e60f3d50902387f27c84
diff --git a/trunk/net/phonet/pep.c b/trunk/net/phonet/pep.c
index 7b048a35ca58..94d72e85a475 100644
--- a/trunk/net/phonet/pep.c
+++ b/trunk/net/phonet/pep.c
@@ -1045,12 +1045,12 @@ static void pep_sock_unhash(struct sock *sk)
 	lock_sock(sk);
 	if ((1 << sk->sk_state) & ~(TCPF_CLOSE|TCPF_LISTEN)) {
 		skparent = pn->listener;
-		sk_del_node_init(sk);
 		release_sock(sk);
 
-		sk = skparent;
 		pn = pep_sk(skparent);
-		lock_sock(sk);
+		lock_sock(skparent);
+		sk_del_node_init(sk);
+		sk = skparent;
 	}
 	/* Unhash a listening sock only when it is closed
 	 * and all of its active connected pipes are closed. */