rtlwifi: rtl8192ce: Fix missing interrupt ready flag

lwfinger · linvjw · commit 87141db0848a · 2014-12-01T15:22:02.000-05:00
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>
diff --git 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)
 
 	rtl_write_dword(rtlpriv, REG_HIMR, rtlpci->irq_mask[0] & 0xFFFFFFFF);
 	rtl_write_dword(rtlpriv, REG_HIMRE, rtlpci->irq_mask[1] & 0xFFFFFFFF);
+	rtlpci->irq_enabled = true;
 }
 
 void rtl92ce_disable_interrupt(struct ieee80211_hw *hw)
@@ -1296,7 +1297,7 @@ void rtl92ce_disable_interrupt(struct ieee80211_hw *hw)
 
 	rtl_write_dword(rtlpriv, REG_HIMR, IMR8190_DISABLED);
 	rtl_write_dword(rtlpriv, REG_HIMRE, IMR8190_DISABLED);
-	synchronize_irq(rtlpci->pdev->irq);
+	rtlpci->irq_enabled = false;
 }
 
 static void _rtl92ce_poweroff_adapter(struct ieee80211_hw *hw)

Original file line number	Diff line number	Diff line change
`@@ -1287,6 +1287,7 @@ void rtl92ce_enable_interrupt(struct ieee80211_hw *hw)`
`1287`	`1287`
`1288`	`1288`	`rtl_write_dword(rtlpriv, REG_HIMR, rtlpci->irq_mask[0] & 0xFFFFFFFF);`
`1289`	`1289`	`rtl_write_dword(rtlpriv, REG_HIMRE, rtlpci->irq_mask[1] & 0xFFFFFFFF);`
	`1290`	`+ rtlpci->irq_enabled = true;`
`1290`	`1291`	`}`
`1291`	`1292`
`1292`	`1293`	`void rtl92ce_disable_interrupt(struct ieee80211_hw *hw)`
`@@ -1296,7 +1297,7 @@ void rtl92ce_disable_interrupt(struct ieee80211_hw *hw)`
`1296`	`1297`
`1297`	`1298`	`rtl_write_dword(rtlpriv, REG_HIMR, IMR8190_DISABLED);`
`1298`	`1299`	`rtl_write_dword(rtlpriv, REG_HIMRE, IMR8190_DISABLED);`
`1299`		`- synchronize_irq(rtlpci->pdev->irq);`
	`1300`	`+ rtlpci->irq_enabled = false;`
`1300`	`1301`	`}`
`1301`	`1302`
`1302`	`1303`	`static void _rtl92ce_poweroff_adapter(struct ieee80211_hw *hw)`