diff options
-rw-r--r-- | net/bluetooth/hci_event.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index fd6eea0941b..35083f2aa2e 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
@@ -898,16 +898,15 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev, | |||
898 | if (!cp) | 898 | if (!cp) |
899 | return; | 899 | return; |
900 | 900 | ||
901 | hci_dev_lock(hdev); | ||
902 | |||
903 | if (cp->enable == 0x01) { | 901 | if (cp->enable == 0x01) { |
904 | del_timer(&hdev->adv_timer); | 902 | del_timer(&hdev->adv_timer); |
903 | |||
904 | hci_dev_lock(hdev); | ||
905 | hci_adv_entries_clear(hdev); | 905 | hci_adv_entries_clear(hdev); |
906 | hci_dev_unlock(hdev); | ||
906 | } else if (cp->enable == 0x00) { | 907 | } else if (cp->enable == 0x00) { |
907 | mod_timer(&hdev->adv_timer, jiffies + ADV_CLEAR_TIMEOUT); | 908 | mod_timer(&hdev->adv_timer, jiffies + ADV_CLEAR_TIMEOUT); |
908 | } | 909 | } |
909 | |||
910 | hci_dev_unlock(hdev); | ||
911 | } | 910 | } |
912 | 911 | ||
913 | static void hci_cc_le_ltk_reply(struct hci_dev *hdev, struct sk_buff *skb) | 912 | static void hci_cc_le_ltk_reply(struct hci_dev *hdev, struct sk_buff *skb) |