projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
[cascardo/linux.git]
/
drivers
/
staging
/
comedi
/
drivers
/
pcmmio.c
diff --git
a/drivers/staging/comedi/drivers/pcmmio.c
b/drivers/staging/comedi/drivers/pcmmio.c
index
35ba939
..
6ca4105
100644
(file)
--- a/
drivers/staging/comedi/drivers/pcmmio.c
+++ b/
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) ");