]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Staging: Comedi adv_pci1710: Combined two conditions
authorTomas Melin <tomas.melin@iki.fi>
Mon, 7 May 2012 19:50:24 +0000 (22:50 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 9 May 2012 20:23:40 +0000 (13:23 -0700)
Combined two if statements making the code cleaner, removing one level
of indentation.

Signed-off-by: Tomas Melin <tomas.melin@iki.fi>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/adv_pci1710.c

index 6dd4f4a486637e630bcc861172428336e1133ef3..3c754cd91e7bed7bca6f078746bb14e74ae4da40 100644 (file)
@@ -1168,12 +1168,11 @@ static int check_channel_list(struct comedi_device *dev,
        for (i = 1, seglen = 1; i < n_chan; i++, seglen++) {
                if (chanlist[0] == chanlist[i])
                        break;  /*  we detected a loop, stop */
-               if (CR_CHAN(chanlist[i]) & 1)
-                       if (CR_AREF(chanlist[i]) == AREF_DIFF) {
-                               comedi_error(dev,
-                                            "Odd channel cannot be differential input!\n");
-                               return 0;
-                       }
+               if ((CR_CHAN(chanlist[i]) & 1) &&
+                   (CR_AREF(chanlist[i]) == AREF_DIFF)) {
+                       comedi_error(dev, "Odd channel cannot be differential input!\n");
+                       return 0;
+               }
                nowmustbechan =
                        (CR_CHAN(chansegment[i - 1]) + 1) % s->n_chan;
                if (CR_AREF(chansegment[i - 1]) == AREF_DIFF)