linux-cvs-patches
[Top] [All Lists]

CVS Update@linux-mips.org: linux

To: linux-cvs-patches@linux-mips.org
Subject: CVS Update@linux-mips.org: linux
From: macro@linux-mips.org
Date: Mon, 13 Jun 2005 20:51:42 +0100
Reply-to: linux-mips@linux-mips.org
Sender: linux-cvs-patches-bounce@linux-mips.org
CVSROOT:        /home/cvs
Module name:    linux
Changes by:     macro@ftp.linux-mips.org        05/06/13 20:51:36

Modified files:
        drivers/net    : declance.c 

Log message:
        Convert to irqreturn_t.

diff -urN linux/drivers/net/declance.c linux/drivers/net/declance.c
--- linux/drivers/net/declance.c        2004/10/25 20:44:28     1.36
+++ linux/drivers/net/declance.c        2005/06/13 19:51:36     1.37
@@ -697,12 +697,13 @@
        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 lance_interrupt(const int irq, void *dev_id,

<Prev in Thread] Current Thread [Next in Thread>