Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: comedi: s626: fix cmd->stop_arg validation for stop_src == TRIG_COUNT 



The only limit for the stop_arg with a stop_src == TRIG_COUNT is that there is at
least 1 scan in order to prevent an empty acquisition. The max test is bogus.

Fix the validation.

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 8b950552

drivers/staging/comedi/drivers/s626.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2208,7 +2208,7 @@ static int s626_ai_cmdtest(struct comedi_device *dev, 
	err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);

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





	if (cmd->stop_src == TRIG_COUNT)

	if (cmd->stop_src == TRIG_COUNT)

		err |= cfc_check_trigger_arg_max(&cmd->stop_arg, 0x00ffffff);

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

	else	/* TRIG_NONE */

	else	/* TRIG_NONE */

		err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);

		err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);