lkml.org 
[lkml]   [2021]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 010/104] scsi: qla2xxx: Fix error return code in qla82xx_write_flash_dword()
    Date
    From: Zhen Lei <thunder.leizhen@huawei.com>

    [ Upstream commit 5cb289bf2d7c34ca1abd794ce116c4f19185a1d4 ]

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

    Link: https://lore.kernel.org/r/20210514090952.6715-1-thunder.leizhen@huawei.com
    Fixes: a9083016a531 ("[SCSI] qla2xxx: Add ISP82XX support.")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
    Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/qla2xxx/qla_nx.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
    index b3ba0de5d4fb..0563c9530dca 100644
    --- a/drivers/scsi/qla2xxx/qla_nx.c
    +++ b/drivers/scsi/qla2xxx/qla_nx.c
    @@ -1066,7 +1066,8 @@ qla82xx_write_flash_dword(struct qla_hw_data *ha, uint32_t flashaddr,
    return ret;
    }

    - if (qla82xx_flash_set_write_enable(ha))
    + ret = qla82xx_flash_set_write_enable(ha);
    + if (ret < 0)
    goto done_write;

    qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_WDATA, data);
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-24 17:57    [W:4.313 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site