diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-11-04 10:54:50 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-07 09:34:02 -0800 |
| commit | fb43ceaf1d869215a0e704f0e83be993bdb07f56 (patch) | |
| tree | a9db3ead838c6d4814b5ee4f33619496f20edab1 | |
| parent | b72b365666701b66d8ff09a5023b0d097d38e538 (diff) | |
staging: comedi: addi_apci_3120: move start_src check into apci3120_cyclic_ai()
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c index 1481d18a12fa..b4d6fb467362 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c @@ -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 */ |