---

yaml --- r: 324866 b: refs/heads/master c: 77d2f7c h: refs/heads/master v: v3
git-mirror · Sep 6, 2012 · b5d2b9b · b5d2b9b
1 parent 4f66b02
commit b5d2b9b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92cfef5d90148f1a91fba528971ed6ae39b1c14b
+refs/heads/master: 77d2f7c24725e3caa82492dd3d1cbd466b8a0abf
diff --git a/trunk/drivers/staging/comedi/drivers/das800.c b/trunk/drivers/staging/comedi/drivers/das800.c
@@ -435,7 +435,7 @@ static irqreturn_t das800_interrupt(int irq, void *d)
 	if (fifo_overflow) {
 		spin_unlock_irqrestore(&dev->spinlock, irq_flags);
 		comedi_error(dev, "DAS800 FIFO overflow");
-		das800_cancel(dev, dev->subdevices + 0);
+		das800_cancel(dev, s);
 		async->events |= COMEDI_CB_ERROR | COMEDI_CB_EOA;
 		comedi_event(dev, s);
 		async->events = 0;