Commit 323538b8 authored Oct 19, 2015 by H Hartley Sweeten Committed by Greg Kroah-Hartman Oct 24, 2015

staging: comedi: adl_pci9118: TRIG_INT is not vaild for scan_begin_src

The (*do_cmdtest) in this driver validated the scan_begin_src as being
TRIG_FOLLOW | TRIG_TIMER | TRIG_EXT. The TRIG_INT source is not valid.

Remove the Step 2 mutual compatibility check that makes sure that TRIG_INT
is only used for the start_src or the scan_begin_src.

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>

parent 9aed0669

drivers/staging/comedi/drivers/adl_pci9118.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -1205,9 +1205,6 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev,
		if (cmd->start_src == TRIG_EXT && cmd->scan_begin_src == TRIG_EXT)
		err \|= -EINVAL;

		if (cmd->start_src == TRIG_INT && cmd->scan_begin_src == TRIG_INT)
		err \|= -EINVAL;

		if ((cmd->scan_begin_src & (TRIG_TIMER \| TRIG_EXT)) &&
		(!(cmd->convert_src & (TRIG_TIMER \| TRIG_NOW))))
		err \|= -EINVAL;