aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192ce/hw.c')
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192ce/hw.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
index c5aced459cd..48c7b5d3fc5 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
@@ -917,10 +917,7 @@ int rtl92ce_hw_init(struct ieee80211_hw *hw)
917 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, 917 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
918 "Failed to download FW. Init HW without FW now..\n"); 918 "Failed to download FW. Init HW without FW now..\n");
919 err = 1; 919 err = 1;
920 rtlhal->fw_ready = false;
921 return err; 920 return err;
922 } else {
923 rtlhal->fw_ready = true;
924 } 921 }
925 922
926 rtlhal->last_hmeboxnum = 0; 923 rtlhal->last_hmeboxnum = 0;
@@ -1193,7 +1190,6 @@ static void _rtl92ce_poweroff_adapter(struct ieee80211_hw *hw)
1193{ 1190{
1194 struct rtl_priv *rtlpriv = rtl_priv(hw); 1191 struct rtl_priv *rtlpriv = rtl_priv(hw);
1195 struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw); 1192 struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
1196 struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
1197 u8 u1b_tmp; 1193 u8 u1b_tmp;
1198 u32 u4b_tmp; 1194 u32 u4b_tmp;
1199 1195
@@ -1204,7 +1200,7 @@ static void _rtl92ce_poweroff_adapter(struct ieee80211_hw *hw)
1204 rtl_write_byte(rtlpriv, REG_APSD_CTRL, 0x40); 1200 rtl_write_byte(rtlpriv, REG_APSD_CTRL, 0x40);
1205 rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE2); 1201 rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE2);
1206 rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE0); 1202 rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE0);
1207 if ((rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7)) && rtlhal->fw_ready) 1203 if (rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7))
1208 rtl92c_firmware_selfreset(hw); 1204 rtl92c_firmware_selfreset(hw);
1209 rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, 0x51); 1205 rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, 0x51);
1210 rtl_write_byte(rtlpriv, REG_MCUFWDL, 0x00); 1206 rtl_write_byte(rtlpriv, REG_MCUFWDL, 0x00);