From 785167727adb54440d485d05b89cd2082fe87e10 Mon Sep 17 00:00:00 2001
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
Date: Mon, 4 Apr 2011 16:00:55 -0300
Subject: [PATCH] --- yaml --- r: 246926 b: refs/heads/master c:
 c916fbe45c1f30417fa28e62cbbfae295a3f315c h: refs/heads/master 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 78a9718cbbf9..ea14c936b2f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49208c9c7b483098401683fef5cfbd66931ca643
+refs/heads/master: c916fbe45c1f30417fa28e62cbbfae295a3f315c
diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c
index 0edfa658090a..5fc852a9ae59 100644
--- a/trunk/net/bluetooth/l2cap_core.c
+++ b/trunk/net/bluetooth/l2cap_core.c
@@ -623,7 +623,7 @@ static struct sock *l2cap_get_sock_by_scid(int state, __le16 cid, bdaddr_t *src)
 
 static void l2cap_le_conn_ready(struct l2cap_conn *conn)
 {
-	struct sock *parent, *uninitialized_var(sk);
+	struct sock *parent, *sk;
 	struct l2cap_chan *chan;
 
 	BT_DBG("");