From aaaf13c9714c03778ce7f15324160295207fe1d1 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Mon, 28 Dec 2009 18:59:01 +0200 Subject: [PATCH] --- yaml --- r: 186609 b: refs/heads/master c: 4b2ba24399cfcd7c80a20cd3bbedc5df0ebd4345 h: refs/heads/master i: 186607: b5f2c94c407388590a1fdaf4cba4f9f5cad4eb43 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/pcmmio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e67f0fe44b34..a99ab3293f76 100644 --- 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 index 35ba93989a36..6ca4105610c1 100644 --- 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) ");