diff options
| author | Mirko Lindner <mlindner@marvell.com> | 2012-07-04 01:38:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-09 09:05:40 +0200 |
| commit | d663d181b9e92d80c2455e460e932d34e7a2a7ae (patch) | |
| tree | 70b3d501b65007577692d2d29719be2497844ea8 /drivers/net/ethernet/marvell | |
| parent | sky2: Added support for Optima EEE (diff) | |
| download | linux-d663d181b9e92d80c2455e460e932d34e7a2a7ae.tar.xz linux-d663d181b9e92d80c2455e460e932d34e7a2a7ae.zip | |
sky2: Fix for interrupt handler
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>
Diffstat (limited to 'drivers/net/ethernet/marvell')
| -rw-r--r-- | drivers/net/ethernet/marvell/sky2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index f1163b2aa284..2b0748dba8b8 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -3080,8 +3080,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]); |