diff mbox

rtlwifi: btcoex: 23b 1ant: initialize bt_disabled to false

Message ID 20170519212539.cihnvwl7irchxoaj@mwanda (mailing list archive)
State Accepted
Commit e578618934cbbdfdb02c5e2382be281fc8af1135
Delegated to: Kalle Valo
Headers show

Commit Message

Dan Carpenter May 19, 2017, 9:25 p.m. UTC
We only want to disable this if bt_disable_cnt is >= 2.

Fixes: f66509e3d7c2 ("rtlwifi: btcoex: Remove 23b 1ant configuration parameter")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
Btw, that patch also introduced Sparse warning but I don't know how to
address it.

drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c:1432:63: warning: odd constant _Bool cast (2 becomes 1)

Comments

Larry Finger May 20, 2017, 2:22 a.m. UTC | #1
On 05/19/2017 04:25 PM, Dan Carpenter wrote:
> We only want to disable this if bt_disable_cnt is >= 2.
> 
> Fixes: f66509e3d7c2 ("rtlwifi: btcoex: Remove 23b 1ant configuration parameter")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> Btw, that patch also introduced Sparse warning but I don't know how to
> address it.
> 
> drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c:1432:63: warning: odd constant _Bool cast (2 becomes 1)

I agree that bt_disabled needs to be initialized. Actually, I would have 
expected an unitialized variable warning out of gcc.

Earlier today, I finished applying the rest of the btcoex patches from Realtek 
and now have a clean Sparse run. I never saw that message, and I certainly do 
not understand it either.

Larry
Dan Carpenter May 20, 2017, 5:29 a.m. UTC | #2
On Fri, May 19, 2017 at 09:22:59PM -0500, Larry Finger wrote:
> On 05/19/2017 04:25 PM, Dan Carpenter wrote:
> > We only want to disable this if bt_disable_cnt is >= 2.
> > 
> > Fixes: f66509e3d7c2 ("rtlwifi: btcoex: Remove 23b 1ant configuration parameter")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > ---
> > Btw, that patch also introduced Sparse warning but I don't know how to
> > address it.
> > 
> > drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c:1432:63: warning: odd constant _Bool cast (2 becomes 1)
> 
> I agree that bt_disabled needs to be initialized. Actually, I would have
> expected an unitialized variable warning out of gcc.
> 
> Earlier today, I finished applying the rest of the btcoex patches from
> Realtek and now have a clean Sparse run. I never saw that message, and I
> certainly do not understand it either.
> 
> Larry

I had another look and I figured it out.  I'll send a patch.

regards,
dan carpenter
Larry Finger May 20, 2017, 3:02 p.m. UTC | #3
On 05/19/2017 04:25 PM, Dan Carpenter wrote:
> We only want to disable this if bt_disable_cnt is >= 2.
> 
> Fixes: f66509e3d7c2 ("rtlwifi: btcoex: Remove 23b 1ant configuration parameter")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Acked-by: Larry Finger <Larry.Finger@lwfinger.net>

Thanks,

Larry
Kalle Valo May 24, 2017, 1:52 p.m. UTC | #4
Dan Carpenter <dan.carpenter@oracle.com> wrote:
> We only want to disable this if bt_disable_cnt is >= 2.
> 
> Fixes: f66509e3d7c2 ("rtlwifi: btcoex: Remove 23b 1ant configuration parameter")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> Acked-by: Larry Finger <Larry.Finger@lwfinger.net>

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

e578618934cb rtlwifi: btcoex: 23b 1ant: initialize bt_disabled to false
diff mbox

Patch

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
index f3704d7db4d5..d563a76f0262 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
@@ -1438,7 +1438,7 @@  static void halbtc8723b1ant_monitor_bt_enable_disable(struct btc_coexist
 {
 	struct rtl_priv *rtlpriv = btcoexist->adapter;
 	static u32 bt_disable_cnt;
-	bool bt_active = true, bt_disabled;
+	bool bt_active = true, bt_disabled = false;
 
 	if (coex_sta->high_priority_tx == 0 &&
 	    coex_sta->high_priority_rx == 0 && coex_sta->low_priority_tx == 0 &&