diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2015-08-16 14:06:07 +0200 |
---|---|---|
committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2015-08-16 14:06:07 +0200 |
commit | 763602962f31c587138c0edda7364807b3321bba (patch) | |
tree | 84167cb01577788710a59482d376a59fc3183e3a /drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | |
parent | 0917f823c59692d751951bf5ea699a2d1e2f26a2 (diff) | |
parent | 352cb8677f83a6cf2139151578c8c79785d2d4bf (diff) |
Merge tag 'v4.1.5' into linux-4.1.y-rt
This is the 4.1.5 stable release
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8188ee/hw.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c index 86ce5b1930e6..e5d8108f1987 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c @@ -1354,27 +1354,11 @@ void rtl88ee_set_qos(struct ieee80211_hw *hw, int aci) } } -static void rtl88ee_clear_interrupt(struct ieee80211_hw *hw) -{ - struct rtl_priv *rtlpriv = rtl_priv(hw); - u32 tmp; - - tmp = rtl_read_dword(rtlpriv, REG_HISR); - rtl_write_dword(rtlpriv, REG_HISR, tmp); - - tmp = rtl_read_dword(rtlpriv, REG_HISRE); - rtl_write_dword(rtlpriv, REG_HISRE, tmp); - - tmp = rtl_read_dword(rtlpriv, REG_HSISR); - rtl_write_dword(rtlpriv, REG_HSISR, tmp); -} - void rtl88ee_enable_interrupt(struct ieee80211_hw *hw) { struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); - rtl88ee_clear_interrupt(hw);/*clear it here first*/ rtl_write_dword(rtlpriv, REG_HIMR, rtlpci->irq_mask[0] & 0xFFFFFFFF); rtl_write_dword(rtlpriv, REG_HIMRE, |