From: Ralf Baechle Date: Mon, 10 Oct 2005 13:51:01 +0000 (+0100) Subject: [PATCH] declance: Convert to irqreturn_t. X-Git-Tag: v2.6.15-rc1~733^2~1^2~29 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da848ec37d9cf9edbe269f8be9b3de52f90d70da;p=linux-2.6 [PATCH] declance: Convert to irqreturn_t. Signed-off-by: Ralf Baechle drivers/net/declance.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/declance.c b/drivers/net/declance.c index 521c83137b..636763b510 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c @@ -697,12 +697,13 @@ out: 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