]> err.no Git - linux-2.6/commitdiff
[PATCH] declance: Convert to irqreturn_t.
authorRalf Baechle <ralf@linux-mips.org>
Mon, 10 Oct 2005 13:51:01 +0000 (14:51 +0100)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 18 Oct 2005 22:03:47 +0000 (18:03 -0400)
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
 drivers/net/declance.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
drivers/net/declance.c

index 521c83137bf67f61e275cacdd0553cc1af9feaa2..636763b5102e59685eb5c3331af2ec3091944dd8 100644 (file)
@@ -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