Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMirko Lindner <mlindner@marvell.com>2012-07-03 23:38:46 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-26 11:34:55 -0800
commitbb9583e497687ff3dd9ccc5185ca1d4d7eb7bea5 (patch)
tree2015d8d520e5d8c2665eff3f1eec1cf1485a54f8
parent6c0e7633180a62ae295075e044e0a821c0a934b5 (diff)
sky2: Fix for interrupt handler
commit d663d181b9e92d80c2455e460e932d34e7a2a7ae upstream. Re-enable interrupts if it is not our interrupt Signed-off-by: Mirko Lindner <mlindner@marvell.com> Signed-off-by: David S. Miller <davem@davemloft.net> Cc: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/sky2.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 9d4a2a38545a..5f93956d73a2 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -2929,8 +2929,10 @@ static irqreturn_t sky2_intr(int irq, void *dev_id)
/* Reading this mask interrupts as side effect */
status = sky2_read32(hw, B0_Y2_SP_ISRC2);
- if (status == 0 || status == ~0)
+ if (status == 0 || status == ~0) {
+ sky2_write32(hw, B0_Y2_SP_ICR, 2);
return IRQ_NONE;
+ }
prefetch(&hw->st_le[hw->st_idx]);