For aesthetics, move the check of the cmd->start_src.
Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
---
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c | 12 +++++-------
1 file 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 1481d18..b4d6fb4 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 */
--
2.0.3
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
