diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-15 17:45:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-15 17:45:52 -0400 |
commit | d8efd82eece89f8a5790b0febf17522affe9e1f1 (patch) | |
tree | f441f9070639e08734de38180027c6a32ebe6c53 /drivers | |
parent | cd619e21ea468b02af9eeed75eae2307ec7de1cb (diff) | |
parent | 1b4676330aa6782bd73ec24cb4896467475f29f5 (diff) | |
download | linux-stable-d8efd82eece89f8a5790b0febf17522affe9e1f1.tar.gz linux-stable-d8efd82eece89f8a5790b0febf17522affe9e1f1.tar.bz2 linux-stable-d8efd82eece89f8a5790b0febf17522affe9e1f1.zip |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"These are four patches for three construction sites:
- Fix register decoding for the combination of multi-core processors
and multi-threading.
- Two more fixes that are part of the ongoing DECstation resurrection
work. One of these touches a DECstation-only network driver.
- Finally Markos' trivial build fix for the AP/SP support.
(With this applied now all MIPS defconfigs are building again)"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: kernel: vpe: Make vpe_attrs an array of pointers.
MIPS: Fix SMP core calculations when using MT support.
MIPS: DECstation I/O ASIC DMA interrupt handling fix
MIPS: DECstation HRT initialization rearrangement
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/amd/declance.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/amd/declance.c b/drivers/net/ethernet/amd/declance.c index 3d86ffeb4e15..94edc9c6fbbf 100644 --- a/drivers/net/ethernet/amd/declance.c +++ b/drivers/net/ethernet/amd/declance.c @@ -725,6 +725,7 @@ static irqreturn_t lance_dma_merr_int(int irq, void *dev_id) { struct net_device *dev = dev_id; + clear_ioasic_dma_irq(irq); printk(KERN_ERR "%s: DMA error\n", dev->name); return IRQ_HANDLED; } |