diff options
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r-- | net/bluetooth/mgmt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index be4c3d03d808..263fa2745d48 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -149,7 +149,7 @@ static int read_index_list(struct sock *sk) | |||
149 | i = 0; | 149 | i = 0; |
150 | list_for_each_entry(d, &hci_dev_list, list) { | 150 | list_for_each_entry(d, &hci_dev_list, list) { |
151 | if (test_and_clear_bit(HCI_AUTO_OFF, &d->flags)) | 151 | if (test_and_clear_bit(HCI_AUTO_OFF, &d->flags)) |
152 | cancel_delayed_work_sync(&d->power_off); | 152 | cancel_delayed_work(&d->power_off); |
153 | 153 | ||
154 | if (test_bit(HCI_SETUP, &d->flags)) | 154 | if (test_bit(HCI_SETUP, &d->flags)) |
155 | continue; | 155 | continue; |
@@ -398,7 +398,7 @@ static int set_discoverable(struct sock *sk, u16 index, unsigned char *data, | |||
398 | if (cp->val) | 398 | if (cp->val) |
399 | scan |= SCAN_INQUIRY; | 399 | scan |= SCAN_INQUIRY; |
400 | else | 400 | else |
401 | cancel_delayed_work_sync(&hdev->discov_off); | 401 | cancel_delayed_work(&hdev->discov_off); |
402 | 402 | ||
403 | err = hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan); | 403 | err = hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan); |
404 | if (err < 0) | 404 | if (err < 0) |