diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-09-09 16:15:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-11 14:35:21 -0700 |
| commit | 71731264847096ab2d2045601b96c9c341a6ae12 (patch) | |
| tree | 2c4490e85b0c0d5cf1818d464de0840f688461b1 /drivers/staging/comedi | |
| parent | 22499048e328469d228bbcbeb32e6c7de3322025 (diff) | |
| download | linux-71731264847096ab2d2045601b96c9c341a6ae12.tar.gz linux-71731264847096ab2d2045601b96c9c341a6ae12.tar.bz2 linux-71731264847096ab2d2045601b96c9c341a6ae12.zip | |
staging: comedi: pcmuio: 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 immediately 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/pcmuio.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c index 3aedeca32513..eb606639c535 100644 --- a/drivers/staging/comedi/drivers/pcmuio.c +++ b/drivers/staging/comedi/drivers/pcmuio.c @@ -416,13 +416,6 @@ static int pcmuio_start_intr(struct comedi_device *dev, unsigned int pol_bits = 0; int i; - if (!chip->continuous && chip->stop_count == 0) { - /* An empty acquisition! */ - s->async->events |= COMEDI_CB_EOA; - chip->active = 0; - return 1; - } - chip->enabled_mask = 0; chip->active = 1; if (cmd->chanlist) { @@ -564,16 +557,10 @@ static int pcmuio_cmdtest(struct comedi_device *dev, err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0); err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len); - switch (cmd->stop_src) { - case TRIG_COUNT: - /* any count allowed */ - break; - case 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); - break; - default: - break; - } if (err) return 3; |