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

staging: comedi: usbduxfast: remove unreachable code in usbduxfast_ai_cmd() 



The (*do_cmdtest) validates that the 'stop_arg' is >= 1 for a 'stop_src'
of TRIG_COUNT and the 'scan_end_arg' is validated to be the 'chanlist_len'
which will always be >= 1. Remove the unreachable error code for an
'ai_sample_count < 1'.

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 42e21c97

drivers/staging/comedi/drivers/usbduxfast.c

+3 −10
Original line number Diff line number Diff line
@@ -809,18 +809,11 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev, 
		up(&devpriv->sem);

		return result;

	}

	if (cmd->stop_src == TRIG_COUNT) {



	if (cmd->stop_src == TRIG_COUNT)

		devpriv->ai_sample_count = cmd->stop_arg * cmd->scan_end_arg;

		if (devpriv->ai_sample_count < 1) {

			dev_err(dev->class_dev,

				"(cmd->stop_arg)*(cmd->scan_end_arg)<1, aborting\n");

			up(&devpriv->sem);

			return -EFAULT;

		}

	} else {

		/* continous acquisition */

	else	/* TRIG_NONE */

		devpriv->ai_sample_count = 0;

	}



	if ((cmd->start_src == TRIG_NOW) || (cmd->start_src == TRIG_EXT)) {

		/* enable this acquisition operation */