diff options
| author | David S. Miller <davem@davemloft.net> | 2014-09-29 14:36:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-29 14:36:33 -0400 |
| commit | 2b7fc477b0423cbcc7be8ad8652e3552198de418 (patch) | |
| tree | 58f6e51300fb344252e171ce4b167498e6be81e3 /drivers/net/arcnet/arcnet.c | |
| parent | 41c91996d99394a75912aa5bfda300b85789ed43 (diff) | |
| parent | 5b85bad2a473a8b90cac93d21ab024ba221a8b09 (diff) | |
| download | kernel_replicant_linux-2b7fc477b0423cbcc7be8ad8652e3552198de418.tar.gz kernel_replicant_linux-2b7fc477b0423cbcc7be8ad8652e3552198de418.tar.bz2 kernel_replicant_linux-2b7fc477b0423cbcc7be8ad8652e3552198de418.zip | |
Merge branch 'arcnet-EAE'
Michael Grzeschik says:
====================
ARCNET: add support for EAE multi interfac card
this series adds support for the PLX Bridge based multi interface
pci cards and adds support to change device address on com200xx chips
during runtime.
This series is based on v3.17-rc7.
It is fixed for build against com20020_cs.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/arcnet/arcnet.c')
| -rw-r--r-- | drivers/net/arcnet/arcnet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c index 3b790de6c976..09de683c167e 100644 --- a/drivers/net/arcnet/arcnet.c +++ b/drivers/net/arcnet/arcnet.c @@ -777,7 +777,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id) ACOMMAND(CFLAGScmd | RESETclear); AINTMASK(0); spin_unlock(&lp->lock); - return IRQ_HANDLED; + return retval; } BUGMSG(D_DURING, "in arcnet_inthandler (status=%Xh, intmask=%Xh)\n", |