* [PATCH net] rsi_91x: fix error return code in rsi_reset_card()
@ 2020-11-17 3:07 Zhang Changzhong
2020-11-17 18:05 ` Jakub Kicinski
2020-11-24 15:05 ` rsi: " Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: Zhang Changzhong @ 2020-11-17 3:07 UTC (permalink / raw)
To: amitkarwar, siva8118, kvalo, davem, kuba
Cc: linux-wireless, netdev, linux-kernel
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.
Fixes: 17ff2c794f39 ("rsi: reset device changes for 9116")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
---
drivers/net/wireless/rsi/rsi_91x_usb.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c
index a62d41c..00b5589 100644
--- a/drivers/net/wireless/rsi/rsi_91x_usb.c
+++ b/drivers/net/wireless/rsi/rsi_91x_usb.c
@@ -741,24 +741,24 @@ static int rsi_reset_card(struct rsi_hw *adapter)
if (ret < 0)
goto fail;
} else {
- if ((rsi_usb_master_reg_write(adapter,
- NWP_WWD_INTERRUPT_TIMER,
- NWP_WWD_INT_TIMER_CLKS,
- RSI_9116_REG_SIZE)) < 0) {
+ ret = rsi_usb_master_reg_write(adapter,
+ NWP_WWD_INTERRUPT_TIMER,
+ NWP_WWD_INT_TIMER_CLKS,
+ RSI_9116_REG_SIZE);
+ if (ret < 0)
goto fail;
- }
- if ((rsi_usb_master_reg_write(adapter,
- NWP_WWD_SYSTEM_RESET_TIMER,
- NWP_WWD_SYS_RESET_TIMER_CLKS,
- RSI_9116_REG_SIZE)) < 0) {
+ ret = rsi_usb_master_reg_write(adapter,
+ NWP_WWD_SYSTEM_RESET_TIMER,
+ NWP_WWD_SYS_RESET_TIMER_CLKS,
+ RSI_9116_REG_SIZE);
+ if (ret < 0)
goto fail;
- }
- if ((rsi_usb_master_reg_write(adapter,
- NWP_WWD_MODE_AND_RSTART,
- NWP_WWD_TIMER_DISABLE,
- RSI_9116_REG_SIZE)) < 0) {
+ ret = rsi_usb_master_reg_write(adapter,
+ NWP_WWD_MODE_AND_RSTART,
+ NWP_WWD_TIMER_DISABLE,
+ RSI_9116_REG_SIZE);
+ if (ret < 0)
goto fail;
- }
}
rsi_dbg(INFO_ZONE, "Reset card done\n");
--
2.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net] rsi_91x: fix error return code in rsi_reset_card()
2020-11-17 3:07 [PATCH net] rsi_91x: fix error return code in rsi_reset_card() Zhang Changzhong
@ 2020-11-17 18:05 ` Jakub Kicinski
2020-11-24 15:05 ` rsi: " Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Jakub Kicinski @ 2020-11-17 18:05 UTC (permalink / raw)
To: Zhang Changzhong
Cc: amitkarwar, siva8118, kvalo, davem, linux-wireless, netdev, linux-kernel
On Tue, 17 Nov 2020 11:07:34 +0800 Zhang Changzhong wrote:
> Fix to return a negative error code from the error handling
> case instead of 0, as done elsewhere in this function.
>
> Fixes: 17ff2c794f39 ("rsi: reset device changes for 9116")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
FWIW please try to tag driver/net/wireless with [PATCH wireless],
Kalle will be taking those via the wireless drivers tree.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: rsi: fix error return code in rsi_reset_card()
2020-11-17 3:07 [PATCH net] rsi_91x: fix error return code in rsi_reset_card() Zhang Changzhong
2020-11-17 18:05 ` Jakub Kicinski
@ 2020-11-24 15:05 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2020-11-24 15:05 UTC (permalink / raw)
To: Zhang Changzhong
Cc: amitkarwar, siva8118, davem, kuba, linux-wireless, netdev, linux-kernel
Zhang Changzhong <zhangchangzhong@huawei.com> wrote:
> Fix to return a negative error code from the error handling
> case instead of 0, as done elsewhere in this function.
>
> Fixes: 17ff2c794f39 ("rsi: reset device changes for 9116")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Patch applied to wireless-drivers-next.git, thanks.
fb21d14694bd rsi: fix error return code in rsi_reset_card()
--
https://patchwork.kernel.org/project/linux-wireless/patch/1605582454-39649-1-git-send-email-zhangchangzhong@huawei.com/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-11-24 15:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-17 3:07 [PATCH net] rsi_91x: fix error return code in rsi_reset_card() Zhang Changzhong
2020-11-17 18:05 ` Jakub Kicinski
2020-11-24 15:05 ` rsi: " 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).