From: H Hartley Sweeten Date: Tue, 4 Nov 2014 17:54:48 +0000 (-0700) Subject: staging: comedi: addi_apci_3120: flip 'us_UseDma' test in apci3120_cyclic_ai() X-Git-Tag: firefly_0821_release~176^2~2665^2~291 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5c66a77e1d1da92f4b42c069d6591ecc41dbe6ba;p=firefly-linux-kernel-4.4.55.git staging: comedi: addi_apci_3120: flip 'us_UseDma' test in apci3120_cyclic_ai() For aesthetics, flip this test and do the DMA setup first. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c index 4760200ca1e0..31ef047b6281 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)