From 98fe18d03c537ad3ef95cc5c8ba64fc319791a88 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Mon, 20 Apr 2009 07:09:16 +0200
Subject: [PATCH] --- yaml --- r: 150851 b: refs/heads/master c:
 44d0e48e8a1fa174edf11e03dc70bd6a146b2a40 h: refs/heads/master i:   150849:
 14a815b56351331e80bb0c119f532ada5515d09b   150847:
 773e615debdd0719cfab87dfe8e7d81bcc47dfff v: v3

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

diff --git a/[refs] b/[refs]
index 11290748625b..eed2d49ac53b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 589d27464846c7cb758f93d9ee380c8ff05a161c
+refs/heads/master: 44d0e48e8a1fa174edf11e03dc70bd6a146b2a40
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
index c0c091533bd0..77e6715d7898 100644
--- a/trunk/net/bluetooth/l2cap.c
+++ b/trunk/net/bluetooth/l2cap.c
@@ -844,7 +844,7 @@ static int l2cap_do_connect(struct sock *sk)
 	struct hci_conn *hcon;
 	struct hci_dev *hdev;
 	__u8 auth_type;
-	int err = 0;
+	int err;
 
 	BT_DBG("%s -> %s psm 0x%2.2x", batostr(src), batostr(dst),
 							l2cap_pi(sk)->psm);