From 301149f39b111eea789afc2d535514f6c7f87fb8 Mon Sep 17 00:00:00 2001 From: Andre Guedes Date: Fri, 9 Sep 2011 18:56:24 -0300 Subject: [PATCH] --- yaml --- r: 266341 b: refs/heads/master c: a8f13c8cd2c732828e5da735c204447a55cdab03 h: refs/heads/master i: 266339: e37164e1bfaf6ee9bf1cb37bce8451516ba478dc v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hci_event.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6c8652b1f137..0f10431dfbf7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51beabdf624df14d0805b001d3f939629b70d9db +refs/heads/master: a8f13c8cd2c732828e5da735c204447a55cdab03 diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c index fd6eea0941b6..35083f2aa2ea 100644 --- a/trunk/net/bluetooth/hci_event.c +++ b/trunk/net/bluetooth/hci_event.c @@ -898,16 +898,15 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev, if (!cp) return; - hci_dev_lock(hdev); - if (cp->enable == 0x01) { del_timer(&hdev->adv_timer); + + hci_dev_lock(hdev); hci_adv_entries_clear(hdev); + hci_dev_unlock(hdev); } else if (cp->enable == 0x00) { mod_timer(&hdev->adv_timer, jiffies + ADV_CLEAR_TIMEOUT); } - - hci_dev_unlock(hdev); } static void hci_cc_le_ltk_reply(struct hci_dev *hdev, struct sk_buff *skb)