Bluetooth: Fix HCI request framework

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / bluetooth / hci_event.c

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 138580745c2ce2679e04475b86131c3f34effca9..8efb9c0d9b2c9b36428324d3f782b052e25fc25a 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -53,8 +53,6 @@ static void hci_cc_inquiry_cancel(struct hci_dev *hdev, struct sk_buff *skb)
        hci_discovery_set_state(hdev, DISCOVERY_STOPPED);
        hci_dev_unlock(hdev);
 
-       hci_req_cmd_complete(hdev, HCI_OP_INQUIRY, status);
-
        hci_conn_check_pending(hdev);
 }
 
@@ -1600,8 +1598,6 @@ static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
 
        BT_DBG("%s status 0x%2.2x", hdev->name, status);
 
-       hci_req_cmd_complete(hdev, HCI_OP_INQUIRY, status);
-
        hci_conn_check_pending(hdev);
 
        if (!test_and_clear_bit(HCI_INQUIRY, &hdev->flags))
@@ -2462,7 +2458,7 @@ static void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb)
        if (opcode != HCI_OP_NOP)
                del_timer(&hdev->cmd_timer);
 
-       hci_req_cmd_status(hdev, opcode, ev->status);
+       hci_req_cmd_complete(hdev, opcode, ev->status);
 
        if (ev->ncmd && !test_bit(HCI_RESET, &hdev->flags)) {
                atomic_set(&hdev->cmd_cnt, 1);