staging: comedi: adl_pci9118: no need to reset ai FIFO after (*insn_read)
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Fri, 5 Sep 2014 16:25:49 +0000 (09:25 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Sep 2014 20:56:08 +0000 (13:56 -0700)
The analog input FIFO is reset at the start of every (*insn_read) and (*do_cmd)
operation. It's also reset for the analog input (*cancel).

There's no reason to reset the FIFO if an (*insn_read) times out or after
all the samples have been acquired.

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>
drivers/staging/comedi/drivers/adl_pci9118.c

index c90afdf..5743960 100644 (file)
@@ -542,10 +542,8 @@ static int pci9118_insn_read_ai(struct comedi_device *dev,
                pci9118_ai_start_conv(dev);
 
                ret = comedi_timeout(dev, s, insn, pci9118_ai_eoc, 0);
-               if (ret) {
-                       pci9118_ai_reset_fifo(dev);
+               if (ret)
                        return ret;
-               }
 
                val = inl(dev->iobase + PCI9118_AI_FIFO_REG);
                if (s->maxdata == 0xffff)
@@ -554,9 +552,7 @@ static int pci9118_insn_read_ai(struct comedi_device *dev,
                        data[n] = (val >> 4) & 0xfff;
        }
 
-       pci9118_ai_reset_fifo(dev);
        return n;
-
 }
 
 static void interrupt_pci9118_ai_mode4_switch(struct comedi_device *dev)