diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-11-04 10:54:54 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-07 09:34:03 -0800 |
| commit | 15e920fb1581c531f8d139534fa58d964d4e8b45 (patch) | |
| tree | cb2f5d4763e030e869f9baf4fd0fa6fb7e21d57c /drivers/staging/comedi/drivers/addi_apci_3120.c | |
| parent | staging: comedi: addi_apci_3120: tidy up timer 2 programming in apci3120_ai_cmd() (diff) | |
| download | linux-dev-15e920fb1581c531f8d139534fa58d964d4e8b45.tar.xz linux-dev-15e920fb1581c531f8d139534fa58d964d4e8b45.zip | |
staging: comedi: addi_apci_3120: reset fifo after programming chanlist
The APCI-3120 documentation says that the FIFO should be reset after the
chanlist sequence is programmed.
Reset the FIFO after programming the chanlist and remove the extra FIFO
resets in the driver.
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>
Diffstat (limited to 'drivers/staging/comedi/drivers/addi_apci_3120.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/addi_apci_3120.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c index 044d2c42bcd5..77499b473bb4 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3120.c +++ b/drivers/staging/comedi/drivers/addi_apci_3120.c @@ -305,6 +305,8 @@ static void apci3120_set_chanlist(struct comedi_device *dev, outw(val, dev->iobase + APCI3120_CHANLIST_REG); } + + apci3120_ai_reset_fifo(dev); } #include "addi-data/hwdrv_apci3120.c" @@ -352,8 +354,6 @@ static int apci3120_ai_insn_read(struct comedi_device *dev, /* fixed conversion time of 10 us */ divisor = apci3120_ns_to_timer(dev, 0, 10000, CMDF_ROUND_NEAREST); - apci3120_ai_reset_fifo(dev); - for (i = 0; i < insn->n; i++) { /* trigger conversion */ apci3120_timer_write(dev, 0, divisor); |