summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-11-23 01:38:19 +0400
committerJohn W. Linville <linville@tuxdriver.com>2011-11-23 01:38:19 +0400
commit82e5fc2a34fa9ffea38f00c4066b7e600a0ca5e6 (patch)
tree0ba7ea091c9afbd13ed129ad578f0194541bd4c0
parent6cccccafe9e8b88adb1800940ded6ad76c587e1b (diff)
downloadlinux-82e5fc2a34fa9ffea38f00c4066b7e600a0ca5e6.tar.xz
Revert "rt2800pci: handle spurious interrupts"
This reverts commit 4ba7d9997869d25bd223dea7536fc1ce9fab3b3b. The original patch was a misguided attempt to improve performance on some hardware that is apparently prone to spurious interrupt generation. Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rt2x00/rt2800pci.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index 4dc2d0f840d4..da48c8ac27bd 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -880,13 +880,8 @@ static irqreturn_t rt2800pci_interrupt(int irq, void *dev_instance)
rt2x00pci_register_read(rt2x00dev, INT_SOURCE_CSR, &reg);
rt2x00pci_register_write(rt2x00dev, INT_SOURCE_CSR, reg);
- /*
- * Some devices can generate interrupts with empty CSR register, we
- * "handle" such irq's to prevent interrupt controller treat them as
- * spurious interrupts and disable irq line.
- */
if (!reg)
- return IRQ_HANDLED;
+ return IRQ_NONE;
if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
return IRQ_HANDLED;