evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: adl_pci9118: TRIG_INT is not a valid scan_begin_src

Browse source 
The (*do_cmdtest) validates the scan_begin_src as TRIG_FOLLOW, TRIG_TIMER,
or TRIG_EXT. Remove the invalid check for TRIG_INT in the (*do_cmd).

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-09-09 13:05:48 -07:00 • committed by Greg Kroah-Hartman
parent d397fd5886
commit abaaa7f83a
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/staging/comedi/drivers/adl_pci9118.c
View file

@ -1328,8 +1328,7 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
* channel manipulation without timers effect * channel manipulation without timers effect
*/ */
if (((cmd->scan_begin_src == TRIG_FOLLOW) || if (((cmd->scan_begin_src == TRIG_FOLLOW) ||
(cmd->scan_begin_src == TRIG_EXT) || (cmd->scan_begin_src == TRIG_EXT)) &&
(cmd->scan_begin_src == TRIG_INT)) &&
(cmd->convert_src == TRIG_TIMER)) { (cmd->convert_src == TRIG_TIMER)) {
/* both timer is used for one time */ /* both timer is used for one time */
if (cmd->scan_begin_src == TRIG_EXT) if (cmd->scan_begin_src == TRIG_EXT)