lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

r6040: restore MIER register correctly when IRQ line is shared

Browse Source 
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 <sdh4@iastate.edu>
Signed-off-by: Joe Chou <joe.chou@rdc.com.tw>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Fainelli
2009-07-08 03:05:14 +00:00
committed by David S. Miller
parent 345aa03120
commit 35976d4d55
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/r6040.c
View File

@@ -704,8 +704,11 @@ static irqreturn_t r6040_interrupt(int irq, void *dev_id)
/* Read MISR status and clear */ /* Read MISR status and clear */
status = ioread16(ioaddr + MISR); 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; return IRQ_NONE;
}
/* RX interrupt request */ /* RX interrupt request */
if (status & RX_INTS) { if (status & RX_INTS) {