---

yaml --- r: 10328 b: refs/heads/master c: da848ec h: refs/heads/master v: v3
git-mirror · Oct 18, 2005 · 291f9b0 · 291f9b0
1 parent 148e809
commit 291f9b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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