]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - net/bluetooth/hci_conn.c
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[karo-tx-linux.git] / net / bluetooth / hci_conn.c
index c1c597e3e198e9ffba26dd4dcf2e59e2ffc923c3..e0af7237cd9245fedfc8886ec446f670ddc48500 100644 (file)
@@ -673,7 +673,7 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
                goto encrypt;
 
 auth:
-       if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend))
+       if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend))
                return 0;
 
        if (!hci_conn_auth(conn, sec_level, auth_type))