---

yaml --- r: 276966 b: refs/heads/master c: d766091 h: refs/heads/master v: v3
git-mirror · Dec 19, 2011 · e695afb · e695afb
1 parent 5a3f773
commit e695afb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79e654787c67f6b05f73366ff8ccac72ba7249e6
+refs/heads/master: d7660918fce210f421cc58c060ca3de71e4ffd37
diff --git a/trunk/net/bluetooth/hci_conn.c b/trunk/net/bluetooth/hci_conn.c
@@ -673,7 +673,7 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
 		goto encrypt;
 
 auth:
-	if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend))
+	if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend))
 		return 0;
 
 	if (!hci_conn_auth(conn, sec_level, auth_type))