summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-07-10 11:50:27 +0300
committerMarcel Holtmann <marcel@holtmann.org>2014-07-10 10:52:09 +0200
commit7fabc0f4c7bd2206c368a79e3ed79b7d36625cfd (patch)
tree3c7261ab5c2a87b3ef7df3e95f6f55b09d0c782e /net
parentb3c6410b8c75cd48e4242af0173bb55701939b9b (diff)
Bluetooth: Fix using test_and_clear instead of test_and_set
The code for updating the HCI_CONNECTABLE flag was incorrectly using test_and_set_bit instead of test_and_clear_bit when HCI_CONNECTABLE is to be cleared. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 84431b86af96..8f9df768f250 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2726,8 +2726,8 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)
changed = !test_and_set_bit(HCI_CONNECTABLE,
&hdev->dev_flags);
else
- changed = test_and_set_bit(HCI_CONNECTABLE,
- &hdev->dev_flags);
+ changed = test_and_clear_bit(HCI_CONNECTABLE,
+ &hdev->dev_flags);
if (changed)
mgmt_new_settings(hdev);