From: H Hartley Sweeten Date: Mon, 19 Oct 2015 20:12:56 +0000 (-0700) Subject: staging: comedi: adl_pci9118: TRIG_INT is not vaild for scan_begin_src X-Git-Tag: firefly_0821_release~176^2~802^2~310 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=323538b825d4b1eb6c8a9022998822898ab52dff;p=firefly-linux-kernel-4.4.55.git 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c index e5e0e1c4e50b..a7c974423a3e 100644 --- a/drivers/staging/comedi/drivers/adl_pci9118.c +++ b/drivers/staging/comedi/drivers/adl_pci9118.c @@ -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;