aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang Changzhong <zhangchangzhong@huawei.com>2020-11-13 14:16:26 +0800
committerJakub Kicinski <kuba@kernel.org>2020-11-16 15:26:42 -0800
commit3beb9be165083c2964eba1923601c3bfac0b02d4 (patch)
tree52ff254ffcb1b521022b4dcdcb82919e62433ea3
parentcfbaa8b33e022aca62a3f2815ffbc02874d4cb8b (diff)
downloadicc-3beb9be165083c2964eba1923601c3bfac0b02d4.tar.gz
qlcnic: fix error return code in qlcnic_83xx_restart_hw()
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>
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
index b8af59fc1aa47f..d2c190732d3ef3 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
@@ -2231,7 +2231,8 @@ static int qlcnic_83xx_restart_hw(struct qlcnic_adapter *adapter)
/* 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,