Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[mv-sheeva.git] / drivers / staging / comedi / drivers / pcmmio.c

diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c
index 35ba93989a36e1c55854280214f668bfbddbdc62..025a52e8981d1868d68497359b4a165d96bfc24a 100644 (file)
--- a/drivers/staging/comedi/drivers/pcmmio.c
+++ b/drivers/staging/comedi/drivers/pcmmio.c
@@ -77,6 +77,7 @@ Configuration Options:
 */
 
 #include <linux/interrupt.h>
+#include <linux/slab.h>
 #include "../comedidev.h"
 #include "pcm_common.h"
 #include <linux/pci.h>         /* for PCI devices */
@@ -550,7 +551,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) ");