* [PATCH] rsi: Uninitialized return value in rsi_reset_card()
@ 2018-04-26 14:42 Dan Carpenter
2018-04-27 12:14 ` Kalle Valo
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2018-04-26 14:42 UTC (permalink / raw)
To: Kalle Valo, Amitkumar Karwar
Cc: Prameela Rani Garnepudi, Siva Rebbagondla, Karun Eagalapati,
linux-wireless, kernel-janitors
If rsi_usb_master_reg_write() fails then "ret" hasn't been initialized.
Fixes: 16d3bb7b2f37 ("rsi: disable fw watchdog timer during reset")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c
index b065438f51b2..6ce6b754df12 100644
--- a/drivers/net/wireless/rsi/rsi_91x_usb.c
+++ b/drivers/net/wireless/rsi/rsi_91x_usb.c
@@ -687,9 +687,10 @@ static int rsi_reset_card(struct rsi_hw *adapter)
*/
msleep(100);
- if (rsi_usb_master_reg_write(adapter, SWBL_REGOUT,
- RSI_FW_WDT_DISABLE_REQ,
- RSI_COMMON_REG_SIZE) < 0) {
+ ret = rsi_usb_master_reg_write(adapter, SWBL_REGOUT,
+ RSI_FW_WDT_DISABLE_REQ,
+ RSI_COMMON_REG_SIZE);
+ if (ret < 0) {
rsi_dbg(ERR_ZONE, "Disabling firmware watchdog timer failed\n");
goto fail;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] rsi: Uninitialized return value in rsi_reset_card()
2018-04-26 14:42 [PATCH] rsi: Uninitialized return value in rsi_reset_card() Dan Carpenter
@ 2018-04-27 12:14 ` Kalle Valo
0 siblings, 0 replies; 2+ messages in thread
From: Kalle Valo @ 2018-04-27 12:14 UTC (permalink / raw)
To: Dan Carpenter
Cc: Amitkumar Karwar, Prameela Rani Garnepudi, Siva Rebbagondla,
Karun Eagalapati, linux-wireless, kernel-janitors
Dan Carpenter <dan.carpenter@oracle.com> writes:
> If rsi_usb_master_reg_write() fails then "ret" hasn't been initialized.
>
> Fixes: 16d3bb7b2f37 ("rsi: disable fw watchdog timer during reset")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c
> index b065438f51b2..6ce6b754df12 100644
> --- a/drivers/net/wireless/rsi/rsi_91x_usb.c
> +++ b/drivers/net/wireless/rsi/rsi_91x_usb.c
> @@ -687,9 +687,10 @@ static int rsi_reset_card(struct rsi_hw *adapter)
> */
> msleep(100);
>
> - if (rsi_usb_master_reg_write(adapter, SWBL_REGOUT,
> - RSI_FW_WDT_DISABLE_REQ,
> - RSI_COMMON_REG_SIZE) < 0) {
> + ret = rsi_usb_master_reg_write(adapter, SWBL_REGOUT,
> + RSI_FW_WDT_DISABLE_REQ,
> + RSI_COMMON_REG_SIZE);
> + if (ret < 0) {
Odd, I thought I replied to this one already but I don't see my mail on
patchwork. Anyway, Gustavo already submitted an identical patch:
https://patchwork.kernel.org/patch/10365985/
--
Kalle Valo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-04-27 12:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-26 14:42 [PATCH] rsi: Uninitialized return value in rsi_reset_card() Dan Carpenter
2018-04-27 12:14 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).