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

Bluetooth: btusb: Fix incorrect type in assignment and uninitialized symbol 

Warnings: drivers/bluetooth/btusb.c:3775 btusb_mtk_setup() error:
uninitialized symbol 'fw_version'.
-> add initial value for fw_version.

Warnings: sparse: sparse: incorrect type in assignment (different base
types)
-> add le32_to_cpu to fix incorrect type in assignment.

Signed-off-by: mark-yw.chen <mark-yw.chen@mediatek.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
mark-yw.chen 2021-02-23 14:27:40 +08:00 committed by Marcel Holtmann
parent 3edc5782fb
commit 201cf3976c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/bluetooth/btusb.c
View File

@ -3497,7 +3497,7 @@ static int btusb_mtk_setup_firmware_79xx(struct hci_dev *hdev, const char *fwnam
fw_ptr = fw->data; fw_ptr = fw->data;
fw_bin_ptr = fw_ptr; fw_bin_ptr = fw_ptr;
globaldesc = (struct btmtk_global_desc *)(fw_ptr + MTK_FW_ROM_PATCH_HEADER_SIZE); globaldesc = (struct btmtk_global_desc *)(fw_ptr + MTK_FW_ROM_PATCH_HEADER_SIZE);
section_num = globaldesc->section_num; section_num = le32_to_cpu(globaldesc->section_num);
for (i = 0; i < section_num; i++) { for (i = 0; i < section_num; i++) {
first_block = 1; first_block = 1;
@ -3505,8 +3505,8 @@ static int btusb_mtk_setup_firmware_79xx(struct hci_dev *hdev, const char *fwnam
sectionmap = (struct btmtk_section_map *)(fw_ptr + MTK_FW_ROM_PATCH_HEADER_SIZE + sectionmap = (struct btmtk_section_map *)(fw_ptr + MTK_FW_ROM_PATCH_HEADER_SIZE +
MTK_FW_ROM_PATCH_GD_SIZE + MTK_FW_ROM_PATCH_SEC_MAP_SIZE * i); MTK_FW_ROM_PATCH_GD_SIZE + MTK_FW_ROM_PATCH_SEC_MAP_SIZE * i);
section_offset = sectionmap->secoffset; section_offset = le32_to_cpu(sectionmap->secoffset);
dl_size = sectionmap->bin_info_spec.dlsize; dl_size = le32_to_cpu(sectionmap->bin_info_spec.dlsize);
if (dl_size > 0) { if (dl_size > 0) {
retry = 20; retry = 20;
@ -3742,7 +3742,7 @@ static int btusb_mtk_setup(struct hci_dev *hdev)
int err, status; int err, status;
u32 dev_id; u32 dev_id;
char fw_bin_name[64]; char fw_bin_name[64];
u32 fw_version; u32 fw_version = 0;
u8 param; u8 param;
calltime = ktime_get(); calltime = ktime_get();