Staging: Comedi adv_pci1710: Combined two conditions

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>
This commit is contained in:
Tomas Melin 2012-05-07 22:50:24 +03:00 committed by Greg Kroah-Hartman
parent 2e0031dd90
commit 583d823160

View File

@ -1168,10 +1168,9 @@ static int check_channel_list(struct comedi_device *dev,
for (i = 1, seglen = 1; i < n_chan; i++, seglen++) { for (i = 1, seglen = 1; i < n_chan; i++, seglen++) {
if (chanlist[0] == chanlist[i]) if (chanlist[0] == chanlist[i])
break; /* we detected a loop, stop */ break; /* we detected a loop, stop */
if (CR_CHAN(chanlist[i]) & 1) if ((CR_CHAN(chanlist[i]) & 1) &&
if (CR_AREF(chanlist[i]) == AREF_DIFF) { (CR_AREF(chanlist[i]) == AREF_DIFF)) {
comedi_error(dev, comedi_error(dev, "Odd channel cannot be differential input!\n");
"Odd channel cannot be differential input!\n");
return 0; return 0;
} }
nowmustbechan = nowmustbechan =