Revert "rt2800pci: handle spurious interrupts"
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Nov 2011 21:38:19 +0000 (16:38 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Nov 2011 21:38:19 +0000 (16:38 -0500)
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>
drivers/net/wireless/rt2x00/rt2800pci.c

index 4dc2d0f840d45d8559a5af36edeb0bef50d6e265..da48c8ac27bd53c3a3ef92d135c66c71d902573d 100644 (file)
@@ -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;