[PATCH 064/108] staging: comedi: addi_apci_3120: flip 'us_UseDma' test in apci3120_cyclic_ai()

[H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>]

For aesthetics, flip this test and do the DMA setup first.

Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
Cc: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index 4760200..31ef047 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -434,8 +434,10 @@ static int apci3120_cyclic_ai(int mode,
 
 	outb(devpriv->mode, dev->iobase + APCI3120_MODE_REG);
 
-	/*  If DMA is disabled */
-	if (!devpriv->us_UseDma) {
+	if (devpriv->us_UseDma) {
+		devpriv->b_InterruptMode = APCI3120_DMA_MODE;
+		apci3120_setup_dma(dev, s);
+	} else {
 		/*  disable EOC and enable EOS */
 		devpriv->b_InterruptMode = APCI3120_EOS_MODE;
 
@@ -461,9 +463,6 @@ static int apci3120_cyclic_ai(int mode,
 			devpriv->b_Timer2Mode = APCI3120_COUNTER;
 			devpriv->b_Timer2Interrupt = 1;
 		}
-	} else {
-		devpriv->b_InterruptMode = APCI3120_DMA_MODE;
-		apci3120_setup_dma(dev, s);
 	}
 
 	if (!devpriv->us_UseDma && cmd->stop_src == TRIG_COUNT)
-- 
2.0.3

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel