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

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

staging: comedi: pcl812: trigger sources were validated in (*do_cmdtest) 



The trigger sources were already validataed in the (*do_cmdtest) before the
(*do_cmd) is called. Remove the unnecessary checks in pcl812_ai_cmd().

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

drivers/staging/comedi/drivers/pcl812.c

+0 −18
Original line number Original line Diff line number Diff line
@@ -631,24 +631,6 @@ static int pcl812_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
	unsigned int divisor1 = 0, divisor2 = 0, i, dma_flags, bytes;

	unsigned int divisor1 = 0, divisor2 = 0, i, dma_flags, bytes;

	struct comedi_cmd *cmd = &s->async->cmd;

	struct comedi_cmd *cmd = &s->async->cmd;





	if (cmd->start_src != TRIG_NOW)

		return -EINVAL;

	if (cmd->scan_begin_src != TRIG_FOLLOW)

		return -EINVAL;

	if (devpriv->use_ext_trg) {

		if (cmd->convert_src != TRIG_EXT)

			return -EINVAL;

	} else {

		if (cmd->convert_src != TRIG_TIMER)

			return -EINVAL;

	}

	if (cmd->scan_end_src != TRIG_COUNT)

		return -EINVAL;

	if (cmd->scan_end_arg != cmd->chanlist_len)

		return -EINVAL;

	if (cmd->chanlist_len > MAX_CHANLIST_LEN)

		return -EINVAL;



	if (cmd->convert_src == TRIG_TIMER) {

	if (cmd->convert_src == TRIG_TIMER) {

		if (cmd->convert_arg < board->ai_ns_min)

		if (cmd->convert_arg < board->ai_ns_min)

			cmd->convert_arg = board->ai_ns_min;

			cmd->convert_arg = board->ai_ns_min;