Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c3d95ed authored by Frederic Danis's avatar Frederic Danis Committed by Kalle Valo
Browse files

ath6kl: Fix ath6kl_bmi_read_hi32 macro 



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

Signed-off-by: default avatarFrederic Danis <frederic.danis@linux.intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent d385623a

drivers/net/wireless/ath/ath6kl/bmi.h

+2 −1
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ struct ath6kl_bmi_target_info { 
		(void) (check_type == val);				\

		addr = ath6kl_get_hi_item_addr(ar, HI_ITEM(item));	\

		ret = ath6kl_bmi_read(ar, addr, (u8 *) &tmp, 4);	\

		if (!ret)						\

			*val = le32_to_cpu(tmp);			\

		ret;							\

	})

drivers/net/wireless/ath/ath6kl/init.c

+10 −2
Original line number Diff line number Diff line
@@ -1161,11 +1161,19 @@ static int ath6kl_upload_board_file(struct ath6kl *ar) 
		ath6kl_bmi_write_hi32(ar, hi_board_data,

				      board_address);

	} 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 */

	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 &&

	    board_ext_address == 0) {