---

yaml --- r: 180413 b: refs/heads/master c: 6c2718d h: refs/heads/master i: 180411: 74447f5 v: v3
git-mirror · Feb 4, 2010 · 0185a70 · 0185a70
1 parent af851e3
commit 0185a70
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 485f1eff73a7b932fd3abb0dfcf804e1a1f59025
+refs/heads/master: 6c2718da59613d76013b501bf0f8bcf9d7794b2d
diff --git a/trunk/net/bluetooth/rfcomm/core.c b/trunk/net/bluetooth/rfcomm/core.c
@@ -1150,7 +1150,11 @@ static int rfcomm_recv_ua(struct rfcomm_session *s, u8 dlci)
 			break;
 
 		case BT_DISCONN:
-			rfcomm_session_put(s);
+			/* When socket is closed and we are not RFCOMM
+			 * initiator rfcomm_process_rx already calls
+			 * rfcomm_session_put() */
+			if (s->sock->sk->sk_state != BT_CLOSED)
+				rfcomm_session_put(s);
 			break;
 		}
 	}