From 24c95b7dbba7ca5ad09188f8d46902f70e3a6439 Mon Sep 17 00:00:00 2001 From: Ksawlii Date: Sun, 24 Nov 2024 00:23:31 +0100 Subject: [PATCH] Revert "wifi: rtw88: always wait for both firmware loading attempts" This reverts commit 5dbdf4c0537c381184db04a03d55bde71df20e29. --- drivers/net/wireless/realtek/rtw88/main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c index 91eea38f6..2ef141689 100755 --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c @@ -1007,21 +1007,20 @@ 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) - ret = -EINVAL; + return -EINVAL; if (chip->wow_fw_name) { fw = &rtwdev->wow_fw; wait_for_completion(&fw->completion); if (!fw->firmware) - ret = -EINVAL; + return -EINVAL; } - return ret; + return 0; } static int rtw_power_on(struct rtw_dev *rtwdev)