---

yaml --- r: 186609 b: refs/heads/master c: 4b2ba24 h: refs/heads/master i: 186607: b5f2c94 v: v3
git-mirror · Mar 4, 2010 · aaaf13c · aaaf13c
1 parent 3c9cb07
commit aaaf13c
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: 5d3aed742498ffe5692e3f974f3f7ea0e99a93bb
+refs/heads/master: 4b2ba24399cfcd7c80a20cd3bbedc5df0ebd4345
diff --git a/trunk/drivers/staging/comedi/drivers/pcmmio.c b/trunk/drivers/staging/comedi/drivers/pcmmio.c
@@ -550,7 +550,7 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 	if (irq[0]) {
 		printk("irq: %u ", irq[0]);
-		if (irq[1] && thisboard->dio_num_asics == 2)
+		if (thisboard->dio_num_asics == 2 && irq[1])
 			printk("second ASIC irq: %u ", irq[1]);
 	} else {
 		printk("(IRQ mode disabled) ");