diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-22 16:36:35 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-22 16:36:35 -0500 |
| commit | 6cccccafe9e8b88adb1800940ded6ad76c587e1b (patch) | |
| tree | c96a5c1eb660782f8687a224d1663ae90b964326 /drivers/net/wireless | |
| parent | 40f9cd299a0e5e8dcdde9b5eb9bfda1cb9109f61 (diff) | |
Revert "rt2x00: handle spurious pci interrupts"
This reverts commit 23085d5796561625db4143a671f1de081f66ef08.
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>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2400pci.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2500pci.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt61pci.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c index 676c7657f5f5..3a6b40239bc1 100644 --- a/drivers/net/wireless/rt2x00/rt2400pci.c +++ b/drivers/net/wireless/rt2x00/rt2400pci.c | |||
| @@ -1380,7 +1380,7 @@ static irqreturn_t rt2400pci_interrupt(int irq, void *dev_instance) | |||
| 1380 | rt2x00pci_register_write(rt2x00dev, CSR7, reg); | 1380 | rt2x00pci_register_write(rt2x00dev, CSR7, reg); |
| 1381 | 1381 | ||
| 1382 | if (!reg) | 1382 | if (!reg) |
| 1383 | return IRQ_HANDLED; | 1383 | return IRQ_NONE; |
| 1384 | 1384 | ||
| 1385 | if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags)) | 1385 | if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags)) |
| 1386 | return IRQ_HANDLED; | 1386 | return IRQ_HANDLED; |
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c index d0b627c6c217..dcc0e1fcca77 100644 --- a/drivers/net/wireless/rt2x00/rt2500pci.c +++ b/drivers/net/wireless/rt2x00/rt2500pci.c | |||
| @@ -1512,7 +1512,7 @@ static irqreturn_t rt2500pci_interrupt(int irq, void *dev_instance) | |||
| 1512 | rt2x00pci_register_write(rt2x00dev, CSR7, reg); | 1512 | rt2x00pci_register_write(rt2x00dev, CSR7, reg); |
| 1513 | 1513 | ||
| 1514 | if (!reg) | 1514 | if (!reg) |
| 1515 | return IRQ_HANDLED; | 1515 | return IRQ_NONE; |
| 1516 | 1516 | ||
| 1517 | if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags)) | 1517 | if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags)) |
| 1518 | return IRQ_HANDLED; | 1518 | return IRQ_HANDLED; |
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index 9d83e70f3e62..bf55b4a311e3 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c | |||
| @@ -2337,7 +2337,7 @@ static irqreturn_t rt61pci_interrupt(int irq, void *dev_instance) | |||
| 2337 | rt2x00pci_register_write(rt2x00dev, INT_SOURCE_CSR, reg); | 2337 | rt2x00pci_register_write(rt2x00dev, INT_SOURCE_CSR, reg); |
| 2338 | 2338 | ||
| 2339 | if (!reg && !reg_mcu) | 2339 | if (!reg && !reg_mcu) |
| 2340 | return IRQ_HANDLED; | 2340 | return IRQ_NONE; |
| 2341 | 2341 | ||
| 2342 | if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags)) | 2342 | if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags)) |
| 2343 | return IRQ_HANDLED; | 2343 | return IRQ_HANDLED; |