aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2014-11-28 11:41:16 -0500
committerJohn W. Linville <linville@tuxdriver.com>2014-12-01 15:22:02 -0500
commit87141db0848aa20c43d453f5545efc8f390d4372 (patch)
tree14ee1212fa6e997a6a4711f320ec10b36039cb78
parentf892914c03131a445b926b82815b03162c19288e (diff)
rtlwifi: rtl8192ce: Fix missing interrupt ready flag
Proper operation with the rewritten PCI mini driver requires that a flag be set when interrupts are enabled. This flag was missed. This patch is one of three needed to fix the kernel regression reported at https://bugzilla.kernel.org/show_bug.cgi?id=88951. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Reported-by: Catalin Iacob <iacobcatalin@gmail.com> Tested-by: Catalin Iacob <iacobcatalin@gmail.com> Cc: Catalin Iacob <iacobcatalin@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192ce/hw.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
index 55357d69397a..d2ec5160bbf0 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
@@ -1287,6 +1287,7 @@ void rtl92ce_enable_interrupt(struct ieee80211_hw *hw)
1287 1287
1288 rtl_write_dword(rtlpriv, REG_HIMR, rtlpci->irq_mask[0] & 0xFFFFFFFF); 1288 rtl_write_dword(rtlpriv, REG_HIMR, rtlpci->irq_mask[0] & 0xFFFFFFFF);
1289 rtl_write_dword(rtlpriv, REG_HIMRE, rtlpci->irq_mask[1] & 0xFFFFFFFF); 1289 rtl_write_dword(rtlpriv, REG_HIMRE, rtlpci->irq_mask[1] & 0xFFFFFFFF);
1290 rtlpci->irq_enabled = true;
1290} 1291}
1291 1292
1292void rtl92ce_disable_interrupt(struct ieee80211_hw *hw) 1293void rtl92ce_disable_interrupt(struct ieee80211_hw *hw)
@@ -1296,7 +1297,7 @@ void rtl92ce_disable_interrupt(struct ieee80211_hw *hw)
1296 1297
1297 rtl_write_dword(rtlpriv, REG_HIMR, IMR8190_DISABLED); 1298 rtl_write_dword(rtlpriv, REG_HIMR, IMR8190_DISABLED);
1298 rtl_write_dword(rtlpriv, REG_HIMRE, IMR8190_DISABLED); 1299 rtl_write_dword(rtlpriv, REG_HIMRE, IMR8190_DISABLED);
1299 synchronize_irq(rtlpci->pdev->irq); 1300 rtlpci->irq_enabled = false;
1300} 1301}
1301 1302
1302static void _rtl92ce_poweroff_adapter(struct ieee80211_hw *hw) 1303static void _rtl92ce_poweroff_adapter(struct ieee80211_hw *hw)