]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
staging: comedi: me4000: use bitwise AND instead of logical
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 14 Aug 2015 08:54:05 +0000 (11:54 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 15 Aug 2015 01:37:58 +0000 (18:37 -0700)
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 <dan.carpenter@oracle.com>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/me4000.c

index 5aa1780cf42b2c0f8ffce8bd3d8c00adc5bd34b7..15a53204a36a5a579745e2ea78c5339289911f05 100644 (file)
@@ -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;