'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 <[email protected]>
---
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 7de4dd047d6b..b2b826b2e09a 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.34.1
> -----Original Message-----
> From: Christophe JAILLET <[email protected]>
> Sent: Sunday, November 13, 2022 11:42 PM
> To: Ping-Ke Shih <[email protected]>; Kalle Valo <[email protected]>; David S. Miller <[email protected]>;
> Eric Dumazet <[email protected]>; Jakub Kicinski <[email protected]>; Paolo Abeni <[email protected]>;
> Timlee <[email protected]>
> Cc: [email protected]; [email protected]; Christophe JAILLET
> <[email protected]>; [email protected]; [email protected]
> Subject: [PATCH] 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 <[email protected]>
Acked-by: Ping-Ke Shih <[email protected]>
Thanks for the fixes.
> ---
> 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 7de4dd047d6b..b2b826b2e09a 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.34.1
Christophe JAILLET <[email protected]> wrote:
> '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 <[email protected]>
> Acked-by: Ping-Ke Shih <[email protected]>
Patch applied to wireless-next.git, thanks.
61ec34dee266 wifi: rtw89: Fix some error handling path in rtw89_wow_enable()
--
https://patchwork.kernel.org/project/linux-wireless/patch/32320176eeff1c635baeea25ef0e87d116859e65.1668354083.git.christophe.jaillet@wanadoo.fr/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches