---

yaml --- r: 243570 b: refs/heads/master c: c100c8f h: refs/heads/master v: v3
git-mirror · Apr 1, 2011 · 8537095 · 8537095
1 parent 1713021
commit 8537095
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c37947459172a02691ccd48cb967e8b605d38c56
+refs/heads/master: c100c8f4c3c6f2a407bdbaaad2c4f1062e6a473a
diff --git a/trunk/net/appletalk/ddp.c b/trunk/net/appletalk/ddp.c
@@ -1051,16 +1051,17 @@ static int atalk_release(struct socket *sock)
 {
 	struct sock *sk = sock->sk;
 
-	sock_hold(sk);
-	lock_sock(sk);
 	if (sk) {
+		sock_hold(sk);
+		lock_sock(sk);
+
 		sock_orphan(sk);
 		sock->sk = NULL;
 		atalk_destroy_socket(sk);
-	}
-	release_sock(sk);
-	sock_put(sk);
 
+		release_sock(sk);
+		sock_put(sk);
+	}
 	return 0;
 }