diff options
| author | Kiran K <kiran.k@intel.com> | 2021-10-05 16:45:56 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2021-10-07 17:57:22 +0200 |
| commit | 107fe0482b549a0e43a971e5fd104719c6e495ef (patch) | |
| tree | 8af5287bba081e8d43083d5ee7229593a8877ab2 /net/bluetooth/hci_codec.c | |
| parent | Bluetooth: Fix handling of SUSPEND_DISCONNECTING (diff) | |
| download | linux-107fe0482b549a0e43a971e5fd104719c6e495ef.tar.xz linux-107fe0482b549a0e43a971e5fd104719c6e495ef.zip | |
Bluetooth: Read codec capabilities only if supported
Read codec capabilities only if HCI_READ_LOCAL_CODEC_CAPABILITIES
command is supported. If capablities are not supported, then
cache codec data without caps.
Signed-off-by: Kiran K <kiran.k@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_codec.c')
| -rw-r--r-- | net/bluetooth/hci_codec.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/net/bluetooth/hci_codec.c b/net/bluetooth/hci_codec.c index f0421d0edaa3..38201532f58e 100644 --- a/net/bluetooth/hci_codec.c +++ b/net/bluetooth/hci_codec.c @@ -25,9 +25,11 @@ static int hci_codec_list_add(struct list_head *list, } entry->transport = sent->transport; entry->len = len; - entry->num_caps = rp->num_caps; - if (rp->num_caps) + entry->num_caps = 0; + if (rp) { + entry->num_caps = rp->num_caps; memcpy(entry->caps, caps, len); + } list_add(&entry->list, list); return 0; @@ -58,6 +60,18 @@ static void hci_read_codec_capabilities(struct hci_dev *hdev, __u8 transport, __u32 len; cmd->transport = i; + + /* If Read_Codec_Capabilities command is not supported + * then just add codec to the list without caps + */ + if (!(hdev->commands[45] & 0x08)) { + hci_dev_lock(hdev); + hci_codec_list_add(&hdev->local_codecs, cmd, + NULL, NULL, 0); + hci_dev_unlock(hdev); + continue; + } + skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_CODEC_CAPS, sizeof(*cmd), cmd, HCI_CMD_TIMEOUT); |