diff options
author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2012-02-24 05:45:44 -0500 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-24 07:02:21 -0500 |
commit | 28b8df77449faa03b573638e089a855f8d25e0ed (patch) | |
tree | 9a6508e56f92c9bdc43132ef3096e4ec5afa26c4 /net/bluetooth | |
parent | 3159d3843aa628b0ee9e8ef4b4fe8c935500c03f (diff) |
Bluetooth: Fix init request completion with AMP controllers
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>
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/hci_event.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 3e817fed7706..e920cd520a82 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
@@ -620,7 +620,7 @@ static void hci_cc_read_local_version(struct hci_dev *hdev, struct sk_buff *skb) | |||
620 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | 620 | BT_DBG("%s status 0x%x", hdev->name, rp->status); |
621 | 621 | ||
622 | if (rp->status) | 622 | if (rp->status) |
623 | return; | 623 | goto done; |
624 | 624 | ||
625 | hdev->hci_ver = rp->hci_ver; | 625 | hdev->hci_ver = rp->hci_ver; |
626 | hdev->hci_rev = __le16_to_cpu(rp->hci_rev); | 626 | 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) | |||
634 | 634 | ||
635 | if (test_bit(HCI_INIT, &hdev->flags)) | 635 | if (test_bit(HCI_INIT, &hdev->flags)) |
636 | hci_setup(hdev); | 636 | hci_setup(hdev); |
637 | |||
638 | done: | ||
639 | hci_req_complete(hdev, HCI_OP_READ_LOCAL_VERSION, rp->status); | ||
637 | } | 640 | } |
638 | 641 | ||
639 | static void hci_setup_link_policy(struct hci_dev *hdev) | 642 | static void hci_setup_link_policy(struct hci_dev *hdev) |