diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:27:19 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:27:19 -0400 |
| commit | 39c853ebfe169f187a760b34f9cbf54751bfce00 (patch) | |
| tree | 2a5a741d0cff7d4f90998b31b32ff80cfccd0369 /drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | |
| parent | fdc81f45e9f57858da6351836507fbcf1b7583ee (diff) | |
| parent | 01e97e6517053d7c0b9af5248e944a9209909cf5 (diff) | |
Merge branch 'for-davem' into for-next
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8723ae/hw.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c index aa085462d0e9..67bb47d77b68 100644 --- a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c @@ -362,7 +362,7 @@ void rtl8723e_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) acm_ctrl &= (~ACMHW_VIQEN); break; case AC3_VO: - acm_ctrl &= (~ACMHW_BEQEN); + acm_ctrl &= (~ACMHW_VOQEN); break; default: RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD, @@ -1183,7 +1183,7 @@ static int _rtl8723e_set_media_status(struct ieee80211_hw *hw, mode); } - rtl_write_byte(rtlpriv, (MSR), bt_msr | mode); + rtl_write_byte(rtlpriv, MSR, bt_msr | mode); rtlpriv->cfg->ops->led_control(hw, ledaction); if (mode == MSR_AP) rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00); |