---

yaml --- r: 290957 b: refs/heads/master c: 7ddb6e0 h: refs/heads/master i: 290955: cf15cfa v: v3
git-mirror · Feb 16, 2012 · 4c4c823 · 4c4c823
1 parent bb9fa1f
commit 4c4c823
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46479e698530b8197d601a23317b7c7654195338
+refs/heads/master: 7ddb6e0f3f7aa265c905b947e9ac4ab9562e52f2
diff --git a/trunk/net/bluetooth/l2cap_sock.c b/trunk/net/bluetooth/l2cap_sock.c
@@ -795,14 +795,16 @@ static void l2cap_sock_kill(struct sock *sk)
 static int l2cap_sock_shutdown(struct socket *sock, int how)
 {
 	struct sock *sk = sock->sk;
-	struct l2cap_chan *chan = l2cap_pi(sk)->chan;
+	struct l2cap_chan *chan;
 	int err = 0;
 
 	BT_DBG("sock %p, sk %p", sock, sk);
 
 	if (!sk)
 		return 0;
 
+	chan = l2cap_pi(sk)->chan;
+
 	lock_sock(sk);
 	if (!sk->sk_shutdown) {
 		if (chan->mode == L2CAP_MODE_ERTM)