From 5a3f773f8b2735d8bf34dc8642d09276f0a15f5f Mon Sep 17 00:00:00 2001
From: Mat Martineau <mathewm@codeaurora.org>
Date: Tue, 6 Dec 2011 16:23:26 -0800
Subject: [PATCH] --- yaml --- r: 276965 b: refs/heads/master c:
 79e654787c67f6b05f73366ff8ccac72ba7249e6 h: refs/heads/master i:   276963:
 f0f4019a3356a345991f6963703803713df8ebd5 v: v3

---
 [refs]                            | 2 +-
 trunk/net/bluetooth/rfcomm/core.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fe00cc5479df..a227834c02ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36e999a83a4a4badd389901eb6d23a30e199b8db
+refs/heads/master: 79e654787c67f6b05f73366ff8ccac72ba7249e6
diff --git a/trunk/net/bluetooth/rfcomm/core.c b/trunk/net/bluetooth/rfcomm/core.c
index 4e32e18211f9..2d28dfe98389 100644
--- a/trunk/net/bluetooth/rfcomm/core.c
+++ b/trunk/net/bluetooth/rfcomm/core.c
@@ -1146,6 +1146,7 @@ static int rfcomm_recv_ua(struct rfcomm_session *s, u8 dlci)
 			if (list_empty(&s->dlcs)) {
 				s->state = BT_DISCONN;
 				rfcomm_send_disc(s, 0);
+				rfcomm_session_clear_timer(s);
 			}
 
 			break;