|
 |
479203 |
From 0367baa38d8c5037a1751d2b39502846f727302d Mon Sep 17 00:00:00 2001
|
|
|
479203 |
From: Zhang Changzhong <zhangchangzhong@huawei.com>
|
|
|
479203 |
Date: Fri, 13 Nov 2020 14:16:26 +0800
|
|
|
479203 |
Subject: [PATCH 02/14] qlcnic: fix error return code in
|
|
|
479203 |
qlcnic_83xx_restart_hw()
|
|
|
479203 |
Git-commit: 3beb9be165083c2964eba1923601c3bfac0b02d4
|
|
|
479203 |
Patch-mainline: v5.10-rc5
|
|
|
479203 |
References: git-fixes
|
|
|
479203 |
|
|
|
479203 |
Fix to return a negative error code from the error handling
|
|
|
479203 |
case instead of 0, as done elsewhere in this function.
|
|
|
479203 |
|
|
|
479203 |
Fixes: 3ced0a88cd4c ("qlcnic: Add support to run firmware POST")
|
|
|
479203 |
Reported-by: Hulk Robot <hulkci@huawei.com>
|
|
|
479203 |
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
|
|
|
479203 |
Link: https://lore.kernel.org/r/1605248186-16013-1-git-send-email-zhangchangzhong@huawei.com
|
|
|
479203 |
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
|
479203 |
Signed-off-by: Denis Kirjanov <denis.kirjanov@suse.com>
|
|
|
479203 |
---
|
|
|
479203 |
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 3 ++-
|
|
|
479203 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
479203 |
|
|
|
479203 |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
|
|
|
479203 |
index 07f9067affc6..efa19041cc5d 100644
|
|
|
479203 |
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
|
|
|
479203 |
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
|
|
|
479203 |
@@ -2251,7 +2251,8 @@ static int qlcnic_83xx_restart_hw(struct qlcnic_adapter *adapter)
|
|
|
479203 |
|
|
|
479203 |
/* Boot either flash image or firmware image from host file system */
|
|
|
479203 |
if (qlcnic_load_fw_file == 1) {
|
|
|
479203 |
- if (qlcnic_83xx_load_fw_image_from_host(adapter))
|
|
|
479203 |
+ err = qlcnic_83xx_load_fw_image_from_host(adapter);
|
|
|
479203 |
+ if (err)
|
|
|
479203 |
return err;
|
|
|
479203 |
} else {
|
|
|
479203 |
QLC_SHARED_REG_WR32(adapter, QLCNIC_FW_IMG_VALID,
|
|
|
479203 |
--
|
|
|
479203 |
2.16.4
|
|
|
479203 |
|