From ae2333e9894d99cb5afc13800198f7ce34e1f85e Mon Sep 17 00:00:00 2001 From: Tomas Melin Date: Mon, 7 May 2012 22:50:24 +0300 Subject: [PATCH] --- yaml --- r: 304560 b: refs/heads/master c: 583d82316081429dce49dc5c76219fa527a2129c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/adv_pci1710.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a652111d04f3..86c4c59fcedc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e0031dd9078ba980bb664b144355c5ff6d6a030 +refs/heads/master: 583d82316081429dce49dc5c76219fa527a2129c diff --git a/trunk/drivers/staging/comedi/drivers/adv_pci1710.c b/trunk/drivers/staging/comedi/drivers/adv_pci1710.c index 6dd4f4a48663..3c754cd91e7b 100644 --- a/trunk/drivers/staging/comedi/drivers/adv_pci1710.c +++ b/trunk/drivers/staging/comedi/drivers/adv_pci1710.c @@ -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)