ice: Fix error return code in ice_init_hw()
authorWei Yongjun <weiyongjun1@huawei.com>
Wed, 28 Mar 2018 12:50:45 +0000 (12:50 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Fri, 6 Apr 2018 14:00:09 +0000 (07:00 -0700)
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>
drivers/net/ethernet/intel/ice/ice_common.c

index 385f5d4..21977ec 100644 (file)
@@ -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);