aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Grzeschik <m.grzeschik@pengutronix.de>2014-09-29 05:55:34 -0400
committerDavid S. Miller <davem@davemloft.net>2014-09-29 14:36:25 -0400
commit226ee6751541a958cd1ad982f5ba0f9affde6141 (patch)
tree3e867b8e9af52ed397219d3d4e732bf26ea48696
parent41c91996d99394a75912aa5bfda300b85789ed43 (diff)
ARCNET: return IRQ_NONE if the interface isn't running
The interrupt handler needs to return IRQ_NONE in case two devices are used with the shared interrupt handler. Otherwise it could steal interrupts from the other interface. Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/arcnet/arcnet.c2
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)
777 ACOMMAND(CFLAGScmd | RESETclear); 777 ACOMMAND(CFLAGScmd | RESETclear);
778 AINTMASK(0); 778 AINTMASK(0);
779 spin_unlock(&lp->lock); 779 spin_unlock(&lp->lock);
780 return IRQ_HANDLED; 780 return retval;
781 } 781 }
782 782
783 BUGMSG(D_DURING, "in arcnet_inthandler (status=%Xh, intmask=%Xh)\n", 783 BUGMSG(D_DURING, "in arcnet_inthandler (status=%Xh, intmask=%Xh)\n",