From 3047d1c3e3ef1a63008c9697431db72b52ff6472 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 7 Jun 2012 17:25:35 -0700 Subject: [PATCH] --- yaml --- r: 317261 b: refs/heads/master c: e26d925f42064a800c1226e15dbaa23da1721fb7 h: refs/heads/master i: 317259: e316f13edf18ef3a536761de17494c99b646ff10 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/pcl816.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 300132982d47..229c294c722c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0bdf8ec0a57e5c4f90f4d6e83938f24653360d84 +refs/heads/master: e26d925f42064a800c1226e15dbaa23da1721fb7 diff --git a/trunk/drivers/staging/comedi/drivers/pcl816.c b/trunk/drivers/staging/comedi/drivers/pcl816.c index 277a23ece6fa..845039cd6207 100644 --- a/trunk/drivers/staging/comedi/drivers/pcl816.c +++ b/trunk/drivers/staging/comedi/drivers/pcl816.c @@ -414,8 +414,8 @@ static irqreturn_t interrupt_pcl816(int irq, void *d) } outb(0, dev->iobase + PCL816_CLRINT); /* clear INT request */ - if ((!dev->irq) | (!devpriv->irq_free) | (!devpriv->irq_blocked) | - (!devpriv->int816_mode)) { + if (!dev->irq || !devpriv->irq_free || !devpriv->irq_blocked || + !devpriv->int816_mode) { if (devpriv->irq_was_now_closed) { devpriv->irq_was_now_closed = 0; /* comedi_error(dev,"last IRQ.."); */