r6040: restore MIER register correctly when IRQ line is shared
Subsystems (2)
PATCH 1/2 r6040: restore MIER register correctly when IRQ line is shared
When the r6040 device IRQ line is shared we will enter the driver interrupt service routine, mask off the device interrupt enable register (MIER) and return with IRQ_NONE, we would then leave the device with interrupts disabled, this patch fixes that issue.
Reported-by Steve Holland <[email protected]>
Signed-off-by Joe Chou <[email protected]>
Signed-off-by Florian Fainelli <[email protected]>
---
drivers/net/r6040.c +4 -1
@@ -704,8 +704,11 @@ static irqreturn_t r6040_interrupt(int irq, void *dev_id)/* Read MISR status and clear */ status =ioread16 (ioaddr +MISR ); -if (status ==0x0000 || status ==0xffff ) +if (status ==0x0000 || status ==0xffff ) { +/* Restore RDC MAC interrupt */ +iowrite16 (misr, ioaddr +MIER );return IRQ_NONE ; + }/* RX interrupt request */ if (status &RX_INTS ) {
From: Florian Fainelli <[email protected]>
Date: Wed, 8 Jul 2009 15:05:14 +0200
Quoted 8 lines
When the r6040 device IRQ line is shared we will enter the driver interrupt service routine, mask off the device interrupt enable register (MIER) and return with
IRQ_NONE, we would then leave the device with interrupts disabled, this patch fixes that issue.Reported-by Steve Holland <[email protected]>Signed-off-by Joe Chou <[email protected]>Signed-off-by Florian Fainelli <[email protected]>
Applied.