summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorZhen Lei <thunder.leizhen@huawei.com>2021-05-14 17:09:52 +0800
committerMartin K. Petersen <martin.petersen@oracle.com>2021-05-15 17:20:28 -0400
commit5cb289bf2d7c34ca1abd794ce116c4f19185a1d4 (patch)
tree6c7985908d0b9d854e5e164ff87ec100f5dd8204 /drivers/scsi
parent73578af92a0fae6609b955fcc9113e50e413c80f (diff)
downloadlinux-stable-5cb289bf2d7c34ca1abd794ce116c4f19185a1d4.tar.gz
linux-stable-5cb289bf2d7c34ca1abd794ce116c4f19185a1d4.tar.bz2
linux-stable-5cb289bf2d7c34ca1abd794ce116c4f19185a1d4.zip
scsi: qla2xxx: Fix error return code in qla82xx_write_flash_dword()
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>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/qla2xxx/qla_nx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 0677295957bc..615e44af1ca6 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -1063,7 +1063,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);