|
@@ -943,12 +943,6 @@ static void hci_cc_le_set_scan_param(struct hci_dev *hdev, struct sk_buff *skb)
|
|
|
|
|
|
BT_DBG("%s status 0x%2.2x", hdev->name, status);
|
|
|
|
|
|
- if (status) {
|
|
|
- hci_dev_lock(hdev);
|
|
|
- mgmt_start_discovery_failed(hdev, status);
|
|
|
- hci_dev_unlock(hdev);
|
|
|
- return;
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
|
|
@@ -965,18 +959,10 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
|
|
|
|
|
|
switch (cp->enable) {
|
|
|
case LE_SCAN_ENABLE:
|
|
|
- if (status) {
|
|
|
- hci_dev_lock(hdev);
|
|
|
- mgmt_start_discovery_failed(hdev, status);
|
|
|
- hci_dev_unlock(hdev);
|
|
|
+ if (status)
|
|
|
return;
|
|
|
- }
|
|
|
|
|
|
set_bit(HCI_LE_SCAN, &hdev->dev_flags);
|
|
|
-
|
|
|
- hci_dev_lock(hdev);
|
|
|
- hci_discovery_set_state(hdev, DISCOVERY_FINDING);
|
|
|
- hci_dev_unlock(hdev);
|
|
|
break;
|
|
|
|
|
|
case LE_SCAN_DISABLE:
|
|
@@ -1077,18 +1063,10 @@ static void hci_cs_inquiry(struct hci_dev *hdev, __u8 status)
|
|
|
|
|
|
if (status) {
|
|
|
hci_conn_check_pending(hdev);
|
|
|
- hci_dev_lock(hdev);
|
|
|
- if (test_bit(HCI_MGMT, &hdev->dev_flags))
|
|
|
- mgmt_start_discovery_failed(hdev, status);
|
|
|
- hci_dev_unlock(hdev);
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
set_bit(HCI_INQUIRY, &hdev->flags);
|
|
|
-
|
|
|
- hci_dev_lock(hdev);
|
|
|
- hci_discovery_set_state(hdev, DISCOVERY_FINDING);
|
|
|
- hci_dev_unlock(hdev);
|
|
|
}
|
|
|
|
|
|
static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)
|