aboutsummaryrefslogtreecommitdiff
path: root/net/bluetooth/hci_conn.c
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2011-12-19 11:37:53 -0200
committerGustavo F. Padovan <padovan@profusion.mobi>2011-12-19 11:37:53 -0200
commit4b0b2f088f12e2ada1297502d7bebde182cf65b0 (patch)
treec3f5bdb06a047eaca8a2e09b6dfd285d0cc26037 /net/bluetooth/hci_conn.c
parent4dad99928211a20a91ec4515ab3b53fd65988f34 (diff)
parentd7660918fce210f421cc58c060ca3de71e4ffd37 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
Conflicts: net/bluetooth/l2cap_core.c
Diffstat (limited to 'net/bluetooth/hci_conn.c')
-rw-r--r--net/bluetooth/hci_conn.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 385cccbcafe0..401d8ea266aa 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -700,7 +700,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))