diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-09 20:18:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-09 20:18:24 -0700 |
| commit | e5a8a896f5180f2950695d2d0b79db348d200ca4 (patch) | |
| tree | 04adc57ae51a6d30a89ffae970770b81ee81fc23 /drivers/net/r6040.c | |
| parent | bff38771e1065c7fc3de87e47ba366151eea573c (diff) | |
| parent | e594e96e8a14101a6decabf6746bd5186287debc (diff) | |
| download | kernel_goldelico_gta04-e5a8a896f5180f2950695d2d0b79db348d200ca4.zip kernel_goldelico_gta04-e5a8a896f5180f2950695d2d0b79db348d200ca4.tar.gz kernel_goldelico_gta04-e5a8a896f5180f2950695d2d0b79db348d200ca4.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/r6040.c')
| -rw-r--r-- | drivers/net/r6040.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index b3197e9..840677f 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c @@ -49,8 +49,8 @@ #include <asm/processor.h> #define DRV_NAME "r6040" -#define DRV_VERSION "0.23" -#define DRV_RELDATE "05May2009" +#define DRV_VERSION "0.24" +#define DRV_RELDATE "08Jul2009" /* PHY CHIP Address */ #define PHY1_ADDR 1 /* For MAC1 */ @@ -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) { |