---

yaml --- r: 83282 b: refs/heads/master c: 93d8074 h: refs/heads/master v: v3
git-mirror · Feb 5, 2008 · 9026a71 · 9026a71
1 parent 5e6ba8f
commit 9026a71
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e46c8cb3cbfa7bafe78d43a3d57750605a2dfa3
+refs/heads/master: 93d807401ced2320d0d1e56bf9de099bba5c0424
diff --git a/trunk/net/bluetooth/rfcomm/tty.c b/trunk/net/bluetooth/rfcomm/tty.c
@@ -429,7 +429,8 @@ static int rfcomm_release_dev(void __user *arg)
 	if (dev->tty)
 		tty_vhangup(dev->tty);
 
-	rfcomm_dev_del(dev);
+	if (!test_bit(RFCOMM_RELEASE_ONHUP, &dev->flags))
+		rfcomm_dev_del(dev);
 	rfcomm_dev_put(dev);
 	return 0;
 }