aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <[email protected]>2015-08-14 11:54:05 +0300
committerGreg Kroah-Hartman <[email protected]>2015-08-14 18:37:58 -0700
commit358d577ce1a7c56c4300a5b773dbf98cf9c76ae2 (patch)
tree347f2b5300bf3269ac8fe7a33ab9ff0144e68409
parentad83dbd974feb2e2a8cc071a1d28782bd4d2c70e (diff)
staging: comedi: me4000: use bitwise AND instead of logical
This was supposed to bitwise AND but there is a typo. Fixes: 1a02387063fb ('staging: comedi: me4000: remove 'board' from me4000_ai_insn_read()') Signed-off-by: Dan Carpenter <[email protected]> Reviewed-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
-rw-r--r--drivers/staging/comedi/drivers/me4000.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 5aa1780cf42b..15a53204a36a 100644
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -480,7 +480,7 @@ static int me4000_ai_insn_read(struct comedi_device *dev,
entry = chan | ME4000_AI_LIST_RANGE(range);
if (aref == AREF_DIFF) {
- if (!(s->subdev_flags && SDF_DIFF)) {
+ if (!(s->subdev_flags & SDF_DIFF)) {
dev_err(dev->class_dev,
"Differential inputs are not available\n");
return -EINVAL;
@@ -559,7 +559,7 @@ static int me4000_ai_check_chanlist(struct comedi_device *dev,
}
if (aref == AREF_DIFF) {
- if (!(s->subdev_flags && SDF_DIFF)) {
+ if (!(s->subdev_flags & SDF_DIFF)) {
dev_err(dev->class_dev,
"Differential inputs are not available\n");
return -EINVAL;