diff options
| author | H Hartley Sweeten | 2014-09-10 01:15:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-09-11 23:35:19 +0200 |
| commit | 52c22b803e1b0259adddb0bd2153674ddb2da0d3 (patch) | |
| tree | 6a0b5839783f2ca1b37113e9ff9e222c1abff66b /drivers/staging/comedi | |
| parent | staging: comedi: adl_pci9118: move pci9118_ai_cmdtest() (diff) | |
| download | kernel-qcow2-linux-52c22b803e1b0259adddb0bd2153674ddb2da0d3.tar.gz kernel-qcow2-linux-52c22b803e1b0259adddb0bd2153674ddb2da0d3.tar.xz kernel-qcow2-linux-52c22b803e1b0259adddb0bd2153674ddb2da0d3.zip | |
staging: comedi: addi_apci_2032: remove "empty acquisition" async command
This driver currently allows a cmd->stop_src == TRIG_COUNT with a cmd->stop_arg
of 0. This causes the (*do_cmd) to immediatelt generate a COMEDI_CB_EOA event
without acquiring any data.
This "empty acquisition" async command is not really useful. Validate that the
cmd->stop_arg is >= 1 in the (*do_cmdtest) and remove the "empty acquisition"
code.
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')
| -rw-r--r-- | drivers/staging/comedi/drivers/addi_apci_2032.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_2032.c b/drivers/staging/comedi/drivers/addi_apci_2032.c index 45ea4a4e451b..8514811a988b 100644 --- a/drivers/staging/comedi/drivers/addi_apci_2032.c +++ b/drivers/staging/comedi/drivers/addi_apci_2032.c @@ -96,16 +96,9 @@ static bool apci2032_int_start(struct comedi_device *dev, subpriv->enabled_isns = enabled_isns; subpriv->stop_count = cmd->stop_arg; - if (cmd->stop_src == TRIG_COUNT && subpriv->stop_count == 0) { - /* An empty acquisition! */ - s->async->events |= COMEDI_CB_EOA; - subpriv->active = false; - do_event = true; - } else { - subpriv->active = true; - outl(enabled_isns, dev->iobase + APCI2032_INT_CTRL_REG); - do_event = false; - } + subpriv->active = true; + outl(enabled_isns, dev->iobase + APCI2032_INT_CTRL_REG); + do_event = false; return do_event; } @@ -141,7 +134,9 @@ static int apci2032_int_cmdtest(struct comedi_device *dev, err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0); err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0); err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len); - if (cmd->stop_src == TRIG_NONE) + if (cmd->stop_src == TRIG_COUNT) + err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1); + else /* TRIG_NONE */ err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0); if (err) |