Unverified Commit 1f4d0ecb authored Dec 03, 2024 by openeuler-ci-bot Committed by Gitee Dec 03, 2024

!13936 wifi: rtw88: always wait for both firmware loading attempts

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Liang <wangliang74@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/FFDUYWDY63ZNZEABR5SBUBI24AEUM4EF/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYPKI 
 
Link:https://gitee.com/openeuler/kernel/pulls/13936

 

Reviewed-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Reviewed-by: Li Nan <linan122@huawei.com>
Signed-off-by: Li Nan <linan122@huawei.com>

parents f676e1bc d9965f13

drivers/net/wireless/realtek/rtw88/main.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -1007,20 +1007,21 @@ static int rtw_wait_firmware_completion(struct rtw_dev *rtwdev)
		{
		struct rtw_chip_info *chip = rtwdev->chip;
		struct rtw_fw_state *fw;
		int ret = 0;

		fw = &rtwdev->fw;
		wait_for_completion(&fw->completion);
		if (!fw->firmware)
		return -EINVAL;
		ret = -EINVAL;

		if (chip->wow_fw_name) {
		fw = &rtwdev->wow_fw;
		wait_for_completion(&fw->completion);
		if (!fw->firmware)
		return -EINVAL;
		ret = -EINVAL;
		}

		return 0;
		return ret;
		}

		static int rtw_power_on(struct rtw_dev *rtwdev)