hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ath6kl: Fix ath6kl_bmi_read_hi32 macro 

tmp may be used uninitialized if ath6kl_bmi_read() returns an error.

Signed-off-by: Frederic Danis <frederic.danis@linux.intel.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Frederic Danis 2014-06-02 21:19:46 +03:00 committed by Kalle Valo
parent d385623a78
commit 1c3d95edf0
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/ath/ath6kl/bmi.h
View File

@ -242,6 +242,7 @@ struct ath6kl_bmi_target_info {
(void) (check_type == val); \ (void) (check_type == val); \
addr = ath6kl_get_hi_item_addr(ar, HI_ITEM(item)); \ addr = ath6kl_get_hi_item_addr(ar, HI_ITEM(item)); \
ret = ath6kl_bmi_read(ar, addr, (u8 *) &tmp, 4); \ ret = ath6kl_bmi_read(ar, addr, (u8 *) &tmp, 4); \
if (!ret) \
*val = le32_to_cpu(tmp); \ *val = le32_to_cpu(tmp); \
ret; \ ret; \
}) })

12
drivers/net/wireless/ath/ath6kl/init.c
View File

@ -1161,11 +1161,19 @@ static int ath6kl_upload_board_file(struct ath6kl *ar)
ath6kl_bmi_write_hi32(ar, hi_board_data, ath6kl_bmi_write_hi32(ar, hi_board_data,
board_address); board_address);
} else { } else {
ath6kl_bmi_read_hi32(ar, hi_board_data, &board_address); ret = ath6kl_bmi_read_hi32(ar, hi_board_data, &board_address);
if (ret) {
ath6kl_err("Failed to get board file target address.\n");
return ret;
}
} }
/* determine where in target ram to write extended board data */ /* determine where in target ram to write extended board data */
ath6kl_bmi_read_hi32(ar, hi_board_ext_data, &board_ext_address); ret = ath6kl_bmi_read_hi32(ar, hi_board_ext_data, &board_ext_address);
if (ret) {
ath6kl_err("Failed to get extended board file target address.\n");
return ret;
}
if (ar->target_type == TARGET_TYPE_AR6003 && if (ar->target_type == TARGET_TYPE_AR6003 &&
board_ext_address == 0) { board_ext_address == 0) {