kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: s626: clarify COMEDI_CB_EOA code

Browse source 
The end-of-acquisition only applies when the cmd->stop_src == TRIG_COUNT.

Refactor the code in s626_handle_eos_interrupt() that detects the end-of-
acquisition to clarify this.

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>
This commit is contained in:
H Hartley Sweeten 2014-09-09 16:16:02 -07:00 • committed by Greg Kroah-Hartman
parent e37b20aa58
commit 27cb98142f
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
drivers/staging/comedi/drivers/s626.c
View file

@ -1501,19 +1501,20 @@ static bool s626_handle_eos_interrupt(struct comedi_device *dev)
/* end of scan occurs */
async->events |= COMEDI_CB_EOS;
if (cmd->stop_src == TRIG_COUNT)
if (cmd->stop_src == TRIG_COUNT) {
devpriv->ai_sample_count--;
if (devpriv->ai_sample_count <= 0) {
devpriv->ai_cmd_running = 0;
if (devpriv->ai_sample_count <= 0) {
devpriv->ai_cmd_running = 0;
/* Stop RPS program */
s626_mc_disable(dev, S626_MC1_ERPS1, S626_P_MC1);
/* Stop RPS program */
s626_mc_disable(dev, S626_MC1_ERPS1, S626_P_MC1);
/* send end of acquisition */
async->events |= COMEDI_CB_EOA;
/* send end of acquisition */
async->events |= COMEDI_CB_EOA;
/* disable master interrupt */
finished = true;
/* disable master interrupt */
finished = true;
}
}
if (devpriv->ai_cmd_running && cmd->scan_begin_src == TRIG_EXT)