summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers/comedi_parport.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2014-08-25 15:23:59 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-08-30 13:20:51 -0700
commit68bd0f6f3cf38da7a99ff2582a9a64d8f62dd664 (patch)
treef46d4c92a7666fc80b123d26ee5f18929b192ffe /drivers/staging/comedi/drivers/comedi_parport.c
parent079d062fb5fa7b52be7f4ed67d55f9629a7a3869 (diff)
staging: comedi: comedi_parport: remove deadcode in parport_intr_cmdtest()
Reported by: coverity 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>
Diffstat (limited to 'drivers/staging/comedi/drivers/comedi_parport.c')
-rw-r--r--drivers/staging/comedi/drivers/comedi_parport.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/comedi_parport.c b/drivers/staging/comedi/drivers/comedi_parport.c
index a42748692357..bf002988192d 100644
--- a/drivers/staging/comedi/drivers/comedi_parport.c
+++ b/drivers/staging/comedi/drivers/comedi_parport.c
@@ -173,9 +173,6 @@ static int parport_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);
@@ -187,10 +184,9 @@ static int parport_intr_cmdtest(struct comedi_device *dev,
if (err)
return 3;
- /* step 4: ignored */
+ /* Step 4: fix up any arguments */
- if (err)
- return 4;
+ /* Step 5: check channel list if it exists */
return 0;
}