From: Ping-Ke Shih <pkshih@realtek.com>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
Kalle Valo <kvalo@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Timlee <timlee@realtek.com>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"kernel-janitors@vger.kernel.org"
<kernel-janitors@vger.kernel.org>,
"linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: RE: [PATCH] wifi: rtw89: Fix some error handling path in rtw89_wow_enable()
Date: Tue, 15 Nov 2022 00:31:38 +0000 [thread overview]
Message-ID: <3e97dad2b634434abf266a17030df464@realtek.com> (raw)
In-Reply-To: <32320176eeff1c635baeea25ef0e87d116859e65.1668354083.git.christophe.jaillet@wanadoo.fr>
> -----Original Message-----
> From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> Sent: Sunday, November 13, 2022 11:42 PM
> To: Ping-Ke Shih <pkshih@realtek.com>; Kalle Valo <kvalo@kernel.org>; David S. Miller <davem@davemloft.net>;
> Eric Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>;
> Timlee <timlee@realtek.com>
> Cc: linux-kernel@vger.kernel.org; kernel-janitors@vger.kernel.org; Christophe JAILLET
> <christophe.jaillet@wanadoo.fr>; linux-wireless@vger.kernel.org; netdev@vger.kernel.org
> 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 <christophe.jaillet@wanadoo.fr>
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
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
next prev parent reply other threads:[~2022-11-15 0:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-13 15:42 [PATCH] wifi: rtw89: Fix some error handling path in rtw89_wow_enable() Christophe JAILLET
2022-11-15 0:31 ` Ping-Ke Shih [this message]
2022-11-16 9:33 ` Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3e97dad2b634434abf266a17030df464@realtek.com \
--to=pkshih@realtek.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=kuba@kernel.org \
--cc=kvalo@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=timlee@realtek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox