From 46e3b502d12de970661616e213d6f713f276461b Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 25 Apr 2011 13:03:02 -0700
Subject: [PATCH] --- yaml --- r: 246979 b: refs/heads/master c:
 bf734843120b905bacc3d24c88d7455ae70bf6e1 h: refs/heads/master i:   246977:
 795858415ebd76216e308c55860bc40470c189b6   246975:
 0c697bf1dff108d455cddfdeebef6d0cba8cd32b v: v3

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

diff --git a/[refs] b/[refs]
index 332b8f4a4708..60945c099511 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 345578d97c549995ddbcc178f16f710602cc06bb
+refs/heads/master: bf734843120b905bacc3d24c88d7455ae70bf6e1
diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c
index d47de2b04b2e..8cfa2a663028 100644
--- a/trunk/net/bluetooth/l2cap_core.c
+++ b/trunk/net/bluetooth/l2cap_core.c
@@ -3609,7 +3609,7 @@ static int l2cap_ertm_data_rcv(struct sock *sk, struct sk_buff *skb)
 static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk_buff *skb)
 {
 	struct l2cap_chan *chan;
-	struct sock *sk;
+	struct sock *sk = NULL;
 	struct l2cap_pinfo *pi;
 	u16 control;
 	u8 tx_seq;