UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bluetooth: btrtl: Correct the length of the HCI command for drop fw 

The original code did not determine the length value of the HCI command
for drop fw even there's no parameter needed. In this commit, use struct
hci_command_hdr to manage opcode and length. It would be more regular and
more readable.

Suggested-by: Alex Lu <alex_lu@realsil.com.cn>
Signed-off-by: Max Chou <max.chou@realtek.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Max Chou 2023-05-30 16:34:20 +08:00 committed by Luiz Augusto von Dentz
parent 7f74563e61
commit 6b42f04e24
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/bluetooth/btrtl.c
View File

@ -1044,12 +1044,11 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev,
struct btrtl_device_info *btrtl_dev; struct btrtl_device_info *btrtl_dev;
struct sk_buff *skb; struct sk_buff *skb;
struct hci_rp_read_local_version *resp; struct hci_rp_read_local_version *resp;
struct hci_command_hdr *cmd;
char cfg_name[40]; char cfg_name[40];
u16 hci_rev, lmp_subver; u16 hci_rev, lmp_subver;
u8 hci_ver, lmp_ver, chip_type = 0; u8 hci_ver, lmp_ver, chip_type = 0;
int ret; int ret;
u16 opcode;
u8 cmd[2];
u8 reg_val[2]; u8 reg_val[2];
btrtl_dev = kzalloc(sizeof(*btrtl_dev), GFP_KERNEL); btrtl_dev = kzalloc(sizeof(*btrtl_dev), GFP_KERNEL);
@ -1118,15 +1117,14 @@ next:
btrtl_dev->drop_fw = false; btrtl_dev->drop_fw = false;
if (btrtl_dev->drop_fw) { if (btrtl_dev->drop_fw) {
opcode = hci_opcode_pack(0x3f, 0x66); skb = bt_skb_alloc(sizeof(*cmd), GFP_KERNEL);
cmd[0] = opcode & 0xff;
cmd[1] = opcode >> 8;
skb = bt_skb_alloc(sizeof(cmd), GFP_KERNEL);
if (!skb) if (!skb)
goto err_free; goto err_free;
skb_put_data(skb, cmd, sizeof(cmd)); cmd = skb_put(skb, HCI_COMMAND_HDR_SIZE);
cmd->opcode = cpu_to_le16(0xfc66);
cmd->plen = 0;
hci_skb_pkt_type(skb) = HCI_COMMAND_PKT; hci_skb_pkt_type(skb) = HCI_COMMAND_PKT;
ret = hdev->send(hdev, skb); ret = hdev->send(hdev, skb);