---

yaml --- r: 276965 b: refs/heads/master c: 79e6547 h: refs/heads/master i: 276963: f0f4019 v: v3
git-mirror · Dec 19, 2011 · 5a3f773 · 5a3f773
1 parent 3b75abf
commit 5a3f773
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;