diff --git a/[refs] b/[refs] index 78cdcabcaaa0..8c2aa4bfc1bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 345aa031207d02d7438c1aa96ed9315911ecd745 +refs/heads/master: 35976d4d557c5017c2180a083e8bd970cf73f3d5 diff --git a/trunk/drivers/net/r6040.c b/trunk/drivers/net/r6040.c index ed63d23a6452..70aac35dc2db 100644 --- a/trunk/drivers/net/r6040.c +++ b/trunk/drivers/net/r6040.c @@ -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) {