Commit 38417cc4 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: addi_apci_3120: fix cmd->convert_arg vaildation 



Regardless of the cmd->scan_begin_src, the minimum cmd->convert_arg
value is 10000 (10us). Fix the validation in apci3120_ai_cmdtest().

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6d312740

drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c

+2 −7
Original line number Diff line number Diff line
@@ -118,13 +118,8 @@ static int apci3120_ai_cmdtest(struct comedi_device *dev, 
	if (cmd->scan_begin_src == TRIG_TIMER)	/* Test Delay timing */

		err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg, 100000);



	if (cmd->scan_begin_src == TRIG_TIMER) {

		if (cmd->convert_arg)

			err |= cfc_check_trigger_arg_min(&cmd->convert_arg,

							 10000);

	} else {

	/* minimum conversion time per sample is 10us */

	err |= cfc_check_trigger_arg_min(&cmd->convert_arg, 10000);

	}



	err |= cfc_check_trigger_arg_min(&cmd->chanlist_len, 1);

	err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);