]> git.ipfire.org Git - people/ms/linux.git/commitdiff
sky2: Fix for interrupt handler
authorMirko Lindner <mlindner@marvell.com>
Tue, 3 Jul 2012 23:38:46 +0000 (23:38 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 26 Nov 2012 19:38:01 +0000 (11:38 -0800)
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>
drivers/net/ethernet/marvell/sky2.c

index 589753fb673b25a664ad7d2d29a4e2e35f13563d..2b78ddd5d631b631aff87de33759a26cc2997001 100644 (file)
@@ -3079,8 +3079,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]);