aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtlwifi/rtl8192ce
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192ce')
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192ce/hw.c9
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192ce/phy.c3
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192ce/rf.c2
3 files changed, 6 insertions, 8 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
index 48c7b5d3fc5b..5c4d9bc040f1 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
@@ -693,7 +693,7 @@ static bool _rtl92ce_init_mac(struct ieee80211_hw *hw)
693 693
694 rtl_write_word(rtlpriv, REG_CR, 0x2ff); 694 rtl_write_word(rtlpriv, REG_CR, 0x2ff);
695 695
696 if (_rtl92ce_llt_table_init(hw) == false) 696 if (!_rtl92ce_llt_table_init(hw))
697 return false; 697 return false;
698 698
699 rtl_write_dword(rtlpriv, REG_HISR, 0xffffffff); 699 rtl_write_dword(rtlpriv, REG_HISR, 0xffffffff);
@@ -906,7 +906,7 @@ int rtl92ce_hw_init(struct ieee80211_hw *hw)
906 rtlpci->being_init_adapter = true; 906 rtlpci->being_init_adapter = true;
907 rtlpriv->intf_ops->disable_aspm(hw); 907 rtlpriv->intf_ops->disable_aspm(hw);
908 rtstatus = _rtl92ce_init_mac(hw); 908 rtstatus = _rtl92ce_init_mac(hw);
909 if (rtstatus != true) { 909 if (!rtstatus) {
910 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Init MAC failed\n"); 910 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Init MAC failed\n");
911 err = 1; 911 err = 1;
912 return err; 912 return err;
@@ -1117,7 +1117,7 @@ void rtl92ce_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
1117 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, 1117 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR,
1118 (u8 *) (&reg_rcr)); 1118 (u8 *) (&reg_rcr));
1119 _rtl92ce_set_bcn_ctrl_reg(hw, 0, BIT(4)); 1119 _rtl92ce_set_bcn_ctrl_reg(hw, 0, BIT(4));
1120 } else if (check_bssid == false) { 1120 } else if (!check_bssid) {
1121 reg_rcr &= (~(RCR_CBSSID_DATA | RCR_CBSSID_BCN)); 1121 reg_rcr &= (~(RCR_CBSSID_DATA | RCR_CBSSID_BCN));
1122 _rtl92ce_set_bcn_ctrl_reg(hw, BIT(4), 0); 1122 _rtl92ce_set_bcn_ctrl_reg(hw, BIT(4), 0);
1123 rtlpriv->cfg->ops->set_hw_reg(hw, 1123 rtlpriv->cfg->ops->set_hw_reg(hw,
@@ -1985,8 +1985,7 @@ bool rtl92ce_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
1985 e_rfpowerstate_toset = ERFON; 1985 e_rfpowerstate_toset = ERFON;
1986 ppsc->hwradiooff = false; 1986 ppsc->hwradiooff = false;
1987 actuallyset = true; 1987 actuallyset = true;
1988 } else if ((ppsc->hwradiooff == false) 1988 } else if (!ppsc->hwradiooff && (e_rfpowerstate_toset == ERFOFF)) {
1989 && (e_rfpowerstate_toset == ERFOFF)) {
1990 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, 1989 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
1991 "GPIOChangeRF - HW Radio OFF, RF OFF\n"); 1990 "GPIOChangeRF - HW Radio OFF, RF OFF\n");
1992 1991
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
index c64daf25566a..88deae67cc14 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
@@ -522,8 +522,7 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,
522 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, 522 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
523 "IPS Set eRf nic enable\n"); 523 "IPS Set eRf nic enable\n");
524 rtstatus = rtl_ps_enable_nic(hw); 524 rtstatus = rtl_ps_enable_nic(hw);
525 } while ((rtstatus != true) 525 } while (!rtstatus && (InitializeCount < 10));
526 && (InitializeCount < 10));
527 RT_CLEAR_PS_LEVEL(ppsc, 526 RT_CLEAR_PS_LEVEL(ppsc,
528 RT_RF_OFF_LEVL_HALT_NIC); 527 RT_RF_OFF_LEVL_HALT_NIC);
529 } else { 528 } else {
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c
index 69d720dd9c38..54c7614958a8 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c
@@ -503,7 +503,7 @@ static bool _rtl92ce_phy_rf6052_config_parafile(struct ieee80211_hw *hw)
503 break; 503 break;
504 } 504 }
505 505
506 if (rtstatus != true) { 506 if (!rtstatus) {
507 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 507 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
508 "Radio[%d] Fail!!\n", rfpath); 508 "Radio[%d] Fail!!\n", rfpath);
509 return false; 509 return false;