Bluetooth: Fix init request completion with AMP controllers
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Fri, 24 Feb 2012 10:45:44 +0000 (12:45 +0200)
committerJohan Hedberg <johan.hedberg@intel.com>
Fri, 24 Feb 2012 12:02:21 +0000 (14:02 +0200)
Mark request status as done for Read Local Version HCI command. In AMP
initialization this HCI command is the last and needs to be completed.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
net/bluetooth/hci_event.c

index 3e817fed770670d08597781217bb96b244dfc371..e920cd520a82b701e5be0485c6da45cdc0a52ed8 100644 (file)
@@ -620,7 +620,7 @@ static void hci_cc_read_local_version(struct hci_dev *hdev, struct sk_buff *skb)
        BT_DBG("%s status 0x%x", hdev->name, rp->status);
 
        if (rp->status)
-               return;
+               goto done;
 
        hdev->hci_ver = rp->hci_ver;
        hdev->hci_rev = __le16_to_cpu(rp->hci_rev);
@@ -634,6 +634,9 @@ static void hci_cc_read_local_version(struct hci_dev *hdev, struct sk_buff *skb)
 
        if (test_bit(HCI_INIT, &hdev->flags))
                hci_setup(hdev);
+
+done:
+       hci_req_complete(hdev, HCI_OP_READ_LOCAL_VERSION, rp->status);
 }
 
 static void hci_setup_link_policy(struct hci_dev *hdev)