lkml.org 
[lkml]   [2020]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 142/376] ice: Fix error return code in ice_add_prof()
    Date
    From: Wei Yongjun <weiyongjun1@huawei.com>

    [ Upstream commit f8d530ac29fe9248f5e58ca5bcf4c368f8393ccf ]

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

    Fixes: 31ad4e4ee1e4 ("ice: Allocate flow profile")
    Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/intel/ice/ice_flex_pipe.c b/drivers/net/ethernet/intel/ice/ice_flex_pipe.c
    index 42bac3ec5526..e7a2671222d2 100644
    --- a/drivers/net/ethernet/intel/ice/ice_flex_pipe.c
    +++ b/drivers/net/ethernet/intel/ice/ice_flex_pipe.c
    @@ -2962,8 +2962,10 @@ ice_add_prof(struct ice_hw *hw, enum ice_block blk, u64 id, u8 ptypes[],

    /* add profile info */
    prof = devm_kzalloc(ice_hw_to_dev(hw), sizeof(*prof), GFP_KERNEL);
    - if (!prof)
    + if (!prof) {
    + status = ICE_ERR_NO_MEMORY;
    goto err_ice_add_prof;
    + }

    prof->profile_cookie = id;
    prof->prof_id = prof_id;
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-19 17:54    [W:2.222 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site