---

yaml --- r: 247679 b: refs/heads/master c: 6dcae1e h: refs/heads/master i: 247677: 81deeb6 247675: f3a9277 247671: 2275ddd 247663: e671bba 247647: 56b94d5 247615: 3627bb2 247551: 9215190 v: v3
git-mirror · May 17, 2011 · 1200bca · 1200bca
1 parent 8c4caf4
commit 1200bca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d46d4d64a85c6ff6118b33afd5d63bcb7e4be54a
+refs/heads/master: 6dcae1eaee2b437536b2fe928a609f9589691ebf
diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c
@@ -3755,7 +3755,7 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk
 
 static inline int l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm, struct sk_buff *skb)
 {
-	struct sock *sk;
+	struct sock *sk = NULL;
 	struct l2cap_chan *chan;
 
 	chan = l2cap_global_chan_by_psm(0, psm, conn->src);
@@ -3788,7 +3788,7 @@ static inline int l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm, str
 
 static inline int l2cap_att_channel(struct l2cap_conn *conn, __le16 cid, struct sk_buff *skb)
 {
-	struct sock *sk;
+	struct sock *sk = NULL;
 	struct l2cap_chan *chan;
 
 	chan = l2cap_global_chan_by_scid(0, cid, conn->src);