From 291f9b03e2d25e0fe01cc6f75e25d053ec0ca473 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Mon, 10 Oct 2005 14:51:01 +0100 Subject: [PATCH] --- yaml --- r: 10328 b: refs/heads/master c: da848ec37d9cf9edbe269f8be9b3de52f90d70da h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/declance.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index df4b53edabc6..acf8e1b9ca9f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 302a5c4b3d4d6aff7772a4b3431bb772586e6011 +refs/heads/master: da848ec37d9cf9edbe269f8be9b3de52f90d70da diff --git a/trunk/drivers/net/declance.c b/trunk/drivers/net/declance.c index 521c83137bf6..636763b5102e 100644 --- a/trunk/drivers/net/declance.c +++ b/trunk/drivers/net/declance.c @@ -697,12 +697,13 @@ static void lance_tx(struct net_device *dev) spin_unlock(&lp->lock); } -static void lance_dma_merr_int(const int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id, + struct pt_regs *regs) { struct net_device *dev = (struct net_device *) dev_id; printk("%s: DMA error\n", dev->name); + return IRQ_HANDLED; } static irqreturn_t