| From foo@baz Sun Nov 22 12:00:04 PM CET 2020 |
| From: Zhang Changzhong <zhangchangzhong@huawei.com> |
| Date: Fri, 13 Nov 2020 14:16:26 +0800 |
| Subject: qlcnic: fix error return code in qlcnic_83xx_restart_hw() |
| |
| From: Zhang Changzhong <zhangchangzhong@huawei.com> |
| |
| [ 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@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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| 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 |
| @@ -2251,7 +2251,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, |
