Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 271612d7 authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo
Browse files

Revert "rtlwifi: btcoex: rtl8723be: fix ant_sel not work" 



This reverts commit f95d95a7.

With commit f95d95a7 ("rtlwifi: btcoex: rtl8723be: fix ant_sel not
work"), the kernel has a NULL pointer dereference oops. This content and
the proper fix will be included in a later patch.

Fixes: f95d95a7 ("rtlwifi: btcoex: rtl8723be: fix ant_sel not work")
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Ping-Ke Shih <pkshih@realtek.com>
Cc: Yan-Hsuan Chuang <yhchuang@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 0a166282

drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c

+0 −3
Original line number Diff line number Diff line
@@ -846,9 +846,6 @@ static bool _rtl8723be_init_mac(struct ieee80211_hw *hw) 
		return false;

	}



	if (rtlpriv->cfg->ops->get_btc_status())

		rtlpriv->btcoexist.btc_ops->btc_power_on_setting(rtlpriv);



	bytetmp = rtl_read_byte(rtlpriv, REG_MULTI_FUNC_CTRL);

	rtl_write_byte(rtlpriv, REG_MULTI_FUNC_CTRL, bytetmp | BIT(3));

drivers/net/wireless/realtek/rtlwifi/wifi.h

+0 −1
Original line number Diff line number Diff line
@@ -2547,7 +2547,6 @@ struct bt_coexist_info { 
struct rtl_btc_ops {

	void (*btc_init_variables) (struct rtl_priv *rtlpriv);

	void (*btc_init_hal_vars) (struct rtl_priv *rtlpriv);

	void (*btc_power_on_setting)(struct rtl_priv *rtlpriv);

	void (*btc_init_hw_config) (struct rtl_priv *rtlpriv);

	void (*btc_ips_notify) (struct rtl_priv *rtlpriv, u8 type);

	void (*btc_lps_notify)(struct rtl_priv *rtlpriv, u8 type);