mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: addi_apci_3120: move start_src check into apci3120_cyclic_ai()

Browse Source 
For aesthetics, move the check of the cmd->start_src.

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-11-04 10:54:50 -07:00
committed by Greg Kroah-Hartman
parent b72b365666
commit fb43ceaf1d
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
View File

@@ -404,8 +404,12 @@ static int apci3120_cyclic_ai(int mode,
cmd->flags);
}
if (devpriv->b_ExttrigEnable)
if (cmd->start_src == TRIG_EXT) {
devpriv->b_ExttrigEnable = 1;
apci3120_exttrig_enable(dev, true);
} else {
devpriv->b_ExttrigEnable = 0;
}
switch (mode) {
case 1:
@@ -488,14 +492,8 @@ static int apci3120_cyclic_ai(int mode,
static int apci3120_ai_cmd(struct comedi_device *dev,
struct comedi_subdevice *s)
{
struct apci3120_private *devpriv = dev->private;
struct comedi_cmd *cmd = &s->async->cmd;
if (cmd->start_src == TRIG_EXT)
devpriv->b_ExttrigEnable = 1;
else
devpriv->b_ExttrigEnable = 0;
if (cmd->scan_begin_src == TRIG_FOLLOW)
return apci3120_cyclic_ai(1, dev, s);
/* TRIG_TIMER */