---

yaml --- r: 353918 b: refs/heads/master c: ef6543d h: refs/heads/master v: v3
git-mirror · Jan 7, 2013 · a092dcc · a092dcc
1 parent b4c8437
commit a092dcc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b652bd83a0528c43e935cb6f2f8df024b7a85c5e
+refs/heads/master: ef6543dbad12c1086f3bc3565d8266352521d8a3
diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_2032.c b/trunk/drivers/staging/comedi/drivers/addi_apci_2032.c
@@ -246,7 +246,13 @@ static irqreturn_t apci2032_interrupt(int irq, void *d)
 		return IRQ_NONE;
 
 	val = inl(dev->iobase + APCI2032_INT_STATUS_REG) & 3;
-	outl(0x00, dev->iobase + APCI2032_INT_CTRL_REG);
+	/* Disable triggered interrupt sources. */
+	outl(~val & 3, dev->iobase + APCI2032_INT_CTRL_REG);
+	/*
+	 * Note: We don't reenable the triggered interrupt sources because they
+	 * are level-sensitive, hardware error status interrupt sources and
+	 * they'd keep triggering interrupts repeatedly.
+	 */
 
 	if (comedi_buf_put(s->async, val))
 		s->async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOS;