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

Commit 63bb4e1e authored by Wei Yongjun's avatar Wei Yongjun Committed by Jeff Kirsher
Browse files

ice: Fix error return code in ice_init_hw() 



Fix to return error code ICE_ERR_NO_MEMORY from the alloc error
handling case instead of 0, as done elsewhere in this function.

Fixes: dc49c772 ("ice: Get MAC/PHY/link info and scheduler topology")
Signed-off-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
Acked-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarTony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 3239534a

drivers/net/ethernet/intel/ice/ice_common.c

+3 −1
Original line number Diff line number Diff line
@@ -468,8 +468,10 @@ enum ice_status ice_init_hw(struct ice_hw *hw) 
	mac_buf_len = sizeof(struct ice_aqc_manage_mac_read_resp);

	mac_buf = devm_kzalloc(ice_hw_to_dev(hw), mac_buf_len, GFP_KERNEL);



	if (!mac_buf)

	if (!mac_buf) {

		status = ICE_ERR_NO_MEMORY;

		goto err_unroll_fltr_mgmt_struct;

	}



	status = ice_aq_manage_mac_read(hw, mac_buf, mac_buf_len, NULL);

	devm_kfree(ice_hw_to_dev(hw), mac_buf);