aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ice/ice_common.c
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2018-03-28 08:50:45 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2018-04-06 10:00:09 -0400
commit63bb4e1ebd9876d250eea24d27a2caf3e0e3302c (patch)
tree815af849a7eb9dc97c987c75bafe39b4c653bcec /drivers/net/ethernet/intel/ice/ice_common.c
parent3239534a79ee6f20cffd974173a1e62e0730e8ac (diff)
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: dc49c7723676 ("ice: Get MAC/PHY/link info and scheduler topology") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Acked-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> Tested-by: Tony Brelinski <tonyx.brelinski@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_common.c')
-rw-r--r--drivers/net/ethernet/intel/ice/ice_common.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c
index 385f5d425d19..21977ec984c4 100644
--- a/drivers/net/ethernet/intel/ice/ice_common.c
+++ b/drivers/net/ethernet/intel/ice/ice_common.c
@@ -468,8 +468,10 @@ enum ice_status ice_init_hw(struct ice_hw *hw)
468 mac_buf_len = sizeof(struct ice_aqc_manage_mac_read_resp); 468 mac_buf_len = sizeof(struct ice_aqc_manage_mac_read_resp);
469 mac_buf = devm_kzalloc(ice_hw_to_dev(hw), mac_buf_len, GFP_KERNEL); 469 mac_buf = devm_kzalloc(ice_hw_to_dev(hw), mac_buf_len, GFP_KERNEL);
470 470
471 if (!mac_buf) 471 if (!mac_buf) {
472 status = ICE_ERR_NO_MEMORY;
472 goto err_unroll_fltr_mgmt_struct; 473 goto err_unroll_fltr_mgmt_struct;
474 }
473 475
474 status = ice_aq_manage_mac_read(hw, mac_buf, mac_buf_len, NULL); 476 status = ice_aq_manage_mac_read(hw, mac_buf, mac_buf_len, NULL);
475 devm_kfree(ice_hw_to_dev(hw), mac_buf); 477 devm_kfree(ice_hw_to_dev(hw), mac_buf);