From abb72ff0c7879c4b37c3e2e5ac3985fcc4dd553c Mon Sep 17 00:00:00 2001
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Date: Thu, 6 Sep 2012 15:05:42 +0300
Subject: [PATCH] --- yaml --- r: 323167 b: refs/heads/master c:
 aad3d0e343900a4c2c5dbc73f76550aa64a0ac1b h: refs/heads/master i:   323165:
 8c9d844cb9b6e788d2d30f1513e93055ce092252   323163:
 3edb30a516a7a94d47500092116c372e3630f71e   323159:
 d619a9bf7f81bedf2cd08390fbc1cbbff0a35fc7   323151:
 77eaab56c59df375058dd59c6024b53ef004b8dd   323135:
 61f6bc5b1e2bf77dda98d3d4b8264480553a2077 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 3006b2c48f37..94ecf2150e7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 562fcc246ebe31ade6e1be08585673b9b2785498
+refs/heads/master: aad3d0e343900a4c2c5dbc73f76550aa64a0ac1b
diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c
index 4ea1710a4783..38c00f142203 100644
--- a/trunk/net/bluetooth/l2cap_core.c
+++ b/trunk/net/bluetooth/l2cap_core.c
@@ -1008,7 +1008,7 @@ static void l2cap_send_disconn_req(struct l2cap_conn *conn, struct l2cap_chan *c
 	if (!conn)
 		return;
 
-	if (chan->mode == L2CAP_MODE_ERTM) {
+	if (chan->mode == L2CAP_MODE_ERTM && chan->state == BT_CONNECTED) {
 		__clear_retrans_timer(chan);
 		__clear_monitor_timer(chan);
 		__clear_ack_timer(chan);