diff options
| author | Tomas Melin | 2012-05-07 21:50:24 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-05-09 22:23:40 +0200 |
| commit | 583d82316081429dce49dc5c76219fa527a2129c (patch) | |
| tree | 910ff4a536a4c15d4d7ac8609155ce167eb8a8de /drivers/staging | |
| parent | Staging: Comedi adv_pci1710: Cleaned up comments (diff) | |
| download | kernel-qcow2-linux-583d82316081429dce49dc5c76219fa527a2129c.tar.gz kernel-qcow2-linux-583d82316081429dce49dc5c76219fa527a2129c.tar.xz kernel-qcow2-linux-583d82316081429dce49dc5c76219fa527a2129c.zip | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/comedi/drivers/adv_pci1710.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c index 6dd4f4a48663..3c754cd91e7b 100644 --- a/drivers/staging/comedi/drivers/adv_pci1710.c +++ b/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) |