Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2776f4b authored by Zhang Changzhong's avatar Zhang Changzhong Committed by Greg Kroah-Hartman
Browse files

qlcnic: fix error return code in qlcnic_83xx_restart_hw() 



[ 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: 3ced0a88 ("qlcnic: Add support to run firmware POST")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Link: https://lore.kernel.org/r/1605248186-16013-1-git-send-email-zhangchangzhong@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3ac1662a

drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c

+2 −1
Original line number Diff line number Diff line
@@ -2251,7 +2251,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,