You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
66 lines
2.2 KiB
66 lines
2.2 KiB
From bb94a58ca685310dad2072683b97365647dd4389 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?=C3=8D=C3=B1igo=20Huguet?= <ihuguet@redhat.com>
|
|
Date: Wed, 24 May 2023 15:00:29 +0200
|
|
Subject: [PATCH 058/142] wifi: rtw89: Fix some error handling path in
|
|
rtw89_wow_enable()
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Bugzilla: https://bugzilla.redhat.com/2207499
|
|
|
|
commit 61ec34dee266f1cea092986d861a2cb136571199
|
|
Author: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
|
|
Date: Sun Nov 13 16:42:21 2022 +0100
|
|
|
|
wifi: rtw89: Fix some error handling path in rtw89_wow_enable()
|
|
|
|
'ret' is not updated after several function calls in rtw89_wow_enable().
|
|
This prevent error handling from working.
|
|
|
|
Add the missing assignments.
|
|
|
|
Fixes: 19e28c7fcc74 ("wifi: rtw89: add WoWLAN function support")
|
|
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
|
|
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
|
|
Signed-off-by: Kalle Valo <kvalo@kernel.org>
|
|
Link: https://lore.kernel.org/r/32320176eeff1c635baeea25ef0e87d116859e65.1668354083.git.christophe.jaillet@wanadoo.fr
|
|
|
|
Signed-off-by: Íñigo Huguet <ihuguet@redhat.com>
|
|
---
|
|
drivers/net/wireless/realtek/rtw89/wow.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/realtek/rtw89/wow.c b/drivers/net/wireless/realtek/rtw89/wow.c
|
|
index 7de4dd047d6b3..b2b826b2e09ae 100644
|
|
--- a/drivers/net/wireless/realtek/rtw89/wow.c
|
|
+++ b/drivers/net/wireless/realtek/rtw89/wow.c
|
|
@@ -744,13 +744,13 @@ static int rtw89_wow_enable(struct rtw89_dev *rtwdev)
|
|
goto out;
|
|
}
|
|
|
|
- rtw89_wow_swap_fw(rtwdev, true);
|
|
+ ret = rtw89_wow_swap_fw(rtwdev, true);
|
|
if (ret) {
|
|
rtw89_err(rtwdev, "wow: failed to swap to wow fw\n");
|
|
goto out;
|
|
}
|
|
|
|
- rtw89_wow_fw_start(rtwdev);
|
|
+ ret = rtw89_wow_fw_start(rtwdev);
|
|
if (ret) {
|
|
rtw89_err(rtwdev, "wow: failed to let wow fw start\n");
|
|
goto out;
|
|
@@ -758,7 +758,7 @@ static int rtw89_wow_enable(struct rtw89_dev *rtwdev)
|
|
|
|
rtw89_wow_enter_lps(rtwdev);
|
|
|
|
- rtw89_wow_enable_trx_post(rtwdev);
|
|
+ ret = rtw89_wow_enable_trx_post(rtwdev);
|
|
if (ret) {
|
|
rtw89_err(rtwdev, "wow: failed to enable trx_post\n");
|
|
goto out;
|
|
--
|
|
2.13.6
|
|
|