From af45226c025382b0c684b1b63b0ffbef5d4d1d79 Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Fri, 24 Feb 2012 12:45:44 +0200 Subject: [PATCH] --- yaml --- r: 291063 b: refs/heads/master c: 28b8df77449faa03b573638e089a855f8d25e0ed h: refs/heads/master i: 291061: e49e2118219dd6aea7c8d20d59a1ba8fb17a1afa 291059: 36861e5ecdde861dae550461b2b2cf1be01b7bf0 291055: 528e4570dad9f6977d74cb9720ff52e2dd6c7a26 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hci_event.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cfcd27d60e53..c71438736d83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3159d3843aa628b0ee9e8ef4b4fe8c935500c03f +refs/heads/master: 28b8df77449faa03b573638e089a855f8d25e0ed diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c index 3e817fed7706..e920cd520a82 100644 --- a/trunk/net/bluetooth/hci_event.c +++ b/trunk/net/bluetooth/hci_event.c @@ -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)