projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0bdf8ec
)
staging: comedi: pcl816: if test should use logical OR not bitwise OR
author
H Hartley Sweeten
<
[email protected]
>
Fri, 8 Jun 2012 00:25:35 +0000
(17:25 -0700)
committer
Greg Kroah-Hartman
<
[email protected]
>
Mon, 11 Jun 2012 23:58:57 +0000
(16:58 -0700)
This quiets a couple sparse warnings about:
warning: dubious: !x | !y
warning: dubious: x | !y
Also, remove the unnecessary parentheses abound the variables.
Signed-off-by: H Hartley Sweeten <
[email protected]
>
Cc: Ian Abbott <
[email protected]
>
Cc: Mori Hess <
[email protected]
>
Signed-off-by: Greg Kroah-Hartman <
[email protected]
>
drivers/staging/comedi/drivers/pcl816.c
patch
|
blob
|
history
diff --git
a/drivers/staging/comedi/drivers/pcl816.c
b/drivers/staging/comedi/drivers/pcl816.c
index 277a23ece6fa9aa0a13201f9871821396a8f2aa7..845039cd62078f8252de8699b78f13dc770519bd 100644
(file)
--- a/
drivers/staging/comedi/drivers/pcl816.c
+++ b/
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.."); */