From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 27 May 2014 17:31:13 +0000 (-0700)
Subject: staging: comedi: usbduxfast: remove unreachable code in usbduxfast_ai_cmd()
X-Git-Tag: v5.15~17469^2~39^2~30
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=71cf2b4aaa1c1055ade82917972832f70180cfcb;p=mirror_ubuntu-kernels.git

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: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c
index 376d14608926..85f9dcf59403 100644
--- a/drivers/staging/comedi/drivers/usbduxfast.c
+++ b/drivers/staging/comedi/drivers/usbduxfast.c
@@ -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 */