diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2017-09-04 13:51:33 -0400 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2017-09-07 08:55:56 -0400 |
commit | a33fcba6ec01efcca33b1afad91057020f247f15 (patch) | |
tree | 8c7f278cf9ef0ab1ae7b49ab03919fc1efd8f7c1 | |
parent | 8e0deed92406d93ae0365cb8a6134db5721e7aca (diff) |
rtlwifi: btcoexist: Fix breakage of ant_sel for rtl8723be
In commit bcd37f4a0831 ("rtlwifi: btcoex: 23b 2ant: let bt transmit when
hw initialisation done"), there is an additional error when the module
parameter ant_sel is used to select the auxilary antenna. The error is
that the antenna selection is not checked when writing the antenna
selection register.
Fixes: bcd37f4a0831 ("rtlwifi: btcoex: 23b 2ant: let bt transmit when hw initialisation done")
Signed-off-by: Larry 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>
Cc: Stable <stable@vger.kernel.org> # 4.12+
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-rw-r--r-- | drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c index 31965f0ef69d..e8f07573aed9 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c | |||
@@ -1183,7 +1183,10 @@ static void btc8723b2ant_set_ant_path(struct btc_coexist *btcoexist, | |||
1183 | } | 1183 | } |
1184 | 1184 | ||
1185 | /* fixed internal switch S1->WiFi, S0->BT */ | 1185 | /* fixed internal switch S1->WiFi, S0->BT */ |
1186 | btcoexist->btc_write_4byte(btcoexist, 0x948, 0x0); | 1186 | if (board_info->btdm_ant_pos == BTC_ANTENNA_AT_MAIN_PORT) |
1187 | btcoexist->btc_write_2byte(btcoexist, 0x948, 0x0); | ||
1188 | else | ||
1189 | btcoexist->btc_write_2byte(btcoexist, 0x948, 0x280); | ||
1187 | 1190 | ||
1188 | switch (antpos_type) { | 1191 | switch (antpos_type) { |
1189 | case BTC_ANT_WIFI_AT_MAIN: | 1192 | case BTC_ANT_WIFI_AT_MAIN: |