Commit 91ed3f75 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: adl_pci9118: no need to reset ai FIFO after (*insn_read)

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 959068c3
......@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment