From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Mon, 20 Oct 2014 22:02:14 +0000 (-0700)
Subject: staging: comedi: ni_65xx: remove deadcode in ni_65xx_intr_cmdtest()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c3e1715890b2c3009155e8865d5c6d649a16a4b5;p=openwrt%2Fstaging%2Fblogic.git

staging: comedi: ni_65xx: remove deadcode in ni_65xx_intr_cmdtest()

Reported-by: coverity (CID 142963)
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/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c
index 3c27f532aa6e..973f0058a1e4 100644
--- a/drivers/staging/comedi/drivers/ni_65xx.c
+++ b/drivers/staging/comedi/drivers/ni_65xx.c
@@ -534,9 +534,6 @@ static int ni_65xx_intr_cmdtest(struct comedi_device *dev,
 	/* Step 2a : make sure trigger sources are unique */
 	/* Step 2b : and mutually compatible */
 
-	if (err)
-		return 2;
-
 	/* Step 3: check if arguments are trivially valid */
 
 	err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);