This is a note to let you know that I've just added the patch titled
qlcnic: fix error return code in qlcnic_83xx_restart_hw()
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
qlcnic-fix-error-return-code-in-qlcnic_83xx_restart_hw.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Sun Nov 22 12:23:07 PM CET 2020
From: Zhang Changzhong <zhangchangzhong@xxxxxxxxxx>
Date: Fri, 13 Nov 2020 14:16:26 +0800
Subject: qlcnic: fix error return code in qlcnic_83xx_restart_hw()
From: Zhang Changzhong <zhangchangzhong@xxxxxxxxxx>
[ 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@xxxxxxxxxx>
Signed-off-by: Zhang Changzhong <zhangchangzhong@xxxxxxxxxx>
Link: https://lore.kernel.org/r/1605248186-16013-1-git-send-email-zhangchangzhong@xxxxxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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
@@ -2255,7 +2255,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,
Patches currently in stable-queue which might be from zhangchangzhong@xxxxxxxxxx are
queue-4.4/ah6-fix-error-return-code-in-ah6_input.patch
queue-4.4/qlcnic-fix-error-return-code-in-qlcnic_83xx_restart_hw.patch
queue-4.4/net-b44-fix-error-return-code-in-b44_init_one.patch
