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

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

staging: comedi: usbduxfast: remove TRIG_TIMER from scan_begin_src 



Currently the (*do_cmdtest) indicates that TRIG_TIMER is a valid scan_begin_src
but later this source is tested as -EINVAL. To simplify the code a bit just
remove the TRIG_TIMER source.

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 a5e99e12

drivers/staging/comedi/drivers/usbduxfast.c

+1 −10
Original line number Original line Diff line number Diff line
@@ -372,7 +372,7 @@ static int usbduxfast_ai_cmdtest(struct comedi_device *dev, 
	err |= cfc_check_trigger_src(&cmd->start_src,

	err |= cfc_check_trigger_src(&cmd->start_src,

					TRIG_NOW | TRIG_EXT | TRIG_INT);

					TRIG_NOW | TRIG_EXT | TRIG_INT);

	err |= cfc_check_trigger_src(&cmd->scan_begin_src,

	err |= cfc_check_trigger_src(&cmd->scan_begin_src,

					TRIG_TIMER | TRIG_FOLLOW | TRIG_EXT);

					TRIG_FOLLOW | TRIG_EXT);

	err |= cfc_check_trigger_src(&cmd->convert_src, TRIG_TIMER | TRIG_EXT);

	err |= cfc_check_trigger_src(&cmd->convert_src, TRIG_TIMER | TRIG_EXT);

	err |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);

	err |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);

	err |= cfc_check_trigger_src(&cmd->stop_src, TRIG_COUNT | TRIG_NONE);

	err |= cfc_check_trigger_src(&cmd->stop_src, TRIG_COUNT | TRIG_NONE);
@@ -424,9 +424,6 @@ static int usbduxfast_ai_cmdtest(struct comedi_device *dev, 
		err |= cfc_check_trigger_arg_is(&cmd->convert_arg, tmp);

		err |= cfc_check_trigger_arg_is(&cmd->convert_arg, tmp);

	}

	}





	if (cmd->scan_begin_src == TRIG_TIMER)

		err |= -EINVAL;



	/* stop source */

	/* stop source */

	switch (cmd->stop_src) {

	switch (cmd->stop_src) {

	case TRIG_COUNT:

	case TRIG_COUNT:
@@ -536,12 +533,6 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev, 
		}

		}

	}

	}

	steps = 0;

	steps = 0;

	if (cmd->scan_begin_src == TRIG_TIMER) {

		dev_err(dev->class_dev,

			"scan_begin_src==TRIG_TIMER not valid\n");

		up(&devpriv->sem);

		return -EINVAL;

	}

	if (cmd->convert_src == TRIG_TIMER)

	if (cmd->convert_src == TRIG_TIMER)

		steps = (cmd->convert_arg * 30) / 1000;

		steps = (cmd->convert_arg * 30) / 1000;