summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2012-02-24 13:47:56 +0200
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-24 14:01:20 +0200
commit3159d3843aa628b0ee9e8ef4b4fe8c935500c03f (patch)
tree76338bc8e90d6fb38c1e11cda34efa1720db4296
parent24b78d0f49b94f658e8bae707c158962535053dd (diff)
downloadlinux-3.10-3159d3843aa628b0ee9e8ef4b4fe8c935500c03f.tar.gz
linux-3.10-3159d3843aa628b0ee9e8ef4b4fe8c935500c03f.tar.bz2
linux-3.10-3159d3843aa628b0ee9e8ef4b4fe8c935500c03f.zip
Bluetooth: Fix init request completion with old controllers
With Bluetooth 1.1 controllers the last command in the HCI init sequence will be a write_local_name, however there was no callback to indicate init request completion in this case. This patch fixes the issue by adding the necessary callback to the write_local_name_complete handler. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
-rw-r--r--net/bluetooth/hci_event.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index fb6543b60de..3e817fed770 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -217,6 +217,8 @@ static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb)
memcpy(hdev->dev_name, sent, HCI_MAX_NAME_LENGTH);
hci_dev_unlock(hdev);
+
+ hci_req_complete(hdev, HCI_OP_WRITE_LOCAL_NAME, status);
}
static void hci_cc_read_local_name(struct hci_dev *hdev, struct sk_buff *skb)