lkml.org 
[lkml]   [2020]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 039/252] qlcnic: fix error return code in qlcnic_83xx_restart_hw()
    Date
    From: Zhang Changzhong <zhangchangzhong@huawei.com>

    [ Upstream commit 3beb9be165083c2964eba1923601c3bfac0b02d4 ]

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

    Fixes: 3ced0a88cd4c ("qlcnic: Add support to run firmware POST")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
    Link: https://lore.kernel.org/r/1605248186-16013-1-git-send-email-zhangchangzhong@huawei.com
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
    +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
    @@ -2232,7 +2232,8 @@ static int qlcnic_83xx_restart_hw(struct

    /* Boot either flash image or firmware image from host file system */
    if (qlcnic_load_fw_file == 1) {
    - if (qlcnic_83xx_load_fw_image_from_host(adapter))
    + err = qlcnic_83xx_load_fw_image_from_host(adapter);
    + if (err)
    return err;
    } else {
    QLC_SHARED_REG_WR32(adapter, QLCNIC_FW_IMG_VALID,

    \
     
     \ /
      Last update: 2020-11-23 14:40    [W:4.245 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site