From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 4 Nov 2014 17:54:50 +0000 (-0700)
Subject: staging: comedi: addi_apci_3120: move start_src check into apci3120_cyclic_ai()
X-Git-Tag: firefly_0821_release~176^2~2665^2~289
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fb43ceaf1d869215a0e704f0e83be993bdb07f56;p=firefly-linux-kernel-4.4.55.git

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>
---

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 */