2017-08-31 14:49:12

by Larry Finger

Subject: [PATCH] rtlwifi: btcoexist: 23b 1ant: fix duplicated code for different branches

A typo led to this issue, which was detected with the help of Coccinelle.

In addition to fixing the error, the code is refactored to eliminate an
if statement.

Addresses-Coverity-ID: 1226788

Reported-by: Gustavo A. R. Silva <[email protected]>
Signed-off-by: Larry Finger <[email protected]>
Cc: Ping-Ke Shih <[email protected]>
Cc: Yan-Hsuan Chuang <[email protected]>
Cc: Birming Chiu <[email protected]>
Cc: Shaofu <[email protected]>
Cc: Steven Ting <[email protected]>
---
.../wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
index c04425236ce4..5f726f6d3567 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
@@ -2260,14 +2260,11 @@ static void halbtc8723b1ant_run_coexist_mechanism(struct btc_coexist *btcoexist)

if (iot_peer != BTC_IOT_PEER_CISCO &&
iot_peer != BTC_IOT_PEER_BROADCOM) {
- if (bt_link_info->sco_exist)
- halbtc8723b1ant_limited_rx(btcoexist,
- NORMAL_EXEC, false,
- false, 0x5);
- else
- halbtc8723b1ant_limited_rx(btcoexist,
- NORMAL_EXEC, false,
- false, 0x5);
+ bool sco_exist = bt_link_info->sco_exist;
+
+ halbtc8723b1ant_limited_rx(btcoexist,
+ NORMAL_EXEC, sco_exist,
+ false, 0x5);
} else {
if (bt_link_info->sco_exist) {
halbtc8723b1ant_limited_rx(btcoexist,
--
2.12.3

2017-09-20 12:44:29

by Kalle Valo

Subject: Re: rtlwifi: btcoexist: 23b 1ant: fix duplicated code for different branches

Larry Finger <[email protected]> wrote:

> A typo led to this issue, which was detected with the help of Coccinelle.
>
> In addition to fixing the error, the code is refactored to eliminate an
> if statement.
>
> Addresses-Coverity-ID: 1226788
>
> Reported-by: Gustavo A. R. Silva <[email protected]>
> Signed-off-by: Larry Finger <[email protected]>
> Cc: Ping-Ke Shih <[email protected]>
> Cc: Yan-Hsuan Chuang <[email protected]>
> Cc: Birming Chiu <[email protected]>
> Cc: Shaofu <[email protected]>
> Cc: Steven Ting <[email protected]>

Patch applied to wireless-drivers-next.git, thanks.

0f61953dd0f5 rtlwifi: btcoexist: 23b 1ant: fix duplicated code for different branches

--
https://patchwork.kernel.org/patch/9932349/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches