Skip to content

Commit 2b7fc47

Browse files
committed
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 <[email protected]>
2 parents 41c9199 + 5b85bad commit 2b7fc47

File tree

5 files changed

+330
-88
lines changed

5 files changed

+330
-88
lines changed

drivers/net/arcnet/arcnet.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
777777
ACOMMAND(CFLAGScmd | RESETclear);
778778
AINTMASK(0);
779779
spin_unlock(&lp->lock);
780-
return IRQ_HANDLED;
780+
return retval;
781781
}
782782

783783
BUGMSG(D_DURING, "in arcnet_inthandler (status=%Xh, intmask=%Xh)\n",

0 commit comments

Comments
 (0)