diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2009-03-16 22:03:51 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:53:54 -0700 |
| commit | 197c82bf25b9e379cb5646561be1a727ab9e84a7 (patch) | |
| tree | a724481202340259075633cade03fbf15dd8b20c /drivers/staging/comedi/kcomedilib | |
| parent | 6a98d36e87a0b38d711d580b5fc9dbba17f68dfc (diff) | |
| download | op-kernel-dev-197c82bf25b9e379cb5646561be1a727ab9e84a7.zip op-kernel-dev-197c82bf25b9e379cb5646561be1a727ab9e84a7.tar.gz | |
Staging: comedi: Remove instances of assignments in conditionals
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/kcomedilib')
| -rw-r--r-- | drivers/staging/comedi/kcomedilib/kcomedilib_main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c index 7133f2f..94a5067 100644 --- a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c +++ b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c @@ -256,7 +256,8 @@ int comedi_do_insn(comedi_t *d, comedi_insn *insn) /* XXX check lock */ - if ((ret = check_chanlist(s, 1, &insn->chanspec)) < 0) { + ret = check_chanlist(s, 1, &insn->chanspec); + if (ret < 0) { rt_printk("bad chanspec\n"); ret = -EINVAL; goto error; @@ -443,7 +444,9 @@ int comedi_cancel(comedi_t *d, unsigned int subdevice) if (!s->cancel || !s->async) return -EINVAL; - if ((ret = s->cancel(dev, s))) + ret = s->cancel(dev, s); + + if (ret) return ret; #ifdef CONFIG_COMEDI_RT |
