diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-11-04 10:54:56 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-07 09:34:03 -0800 |
| commit | fdeb2f548790074dd7f9c39275b727ad00600af8 (patch) | |
| tree | 45edb56c2c3b99b441e64c2b73682d2070883cb4 /drivers/staging/comedi/drivers/addi_apci_3120.c | |
| parent | staging: comedi: addi_apci_3120: set scan length/start after programming chanlist (diff) | |
| download | linux-dev-fdeb2f548790074dd7f9c39275b727ad00600af8.tar.xz linux-dev-fdeb2f548790074dd7f9c39275b727ad00600af8.zip | |
staging: comedi: addi_apci_3120: enable chanlist scanning if needed
The 'SCAN_ENA' bit in the mode register needs to be set if the chanlist
has more than 1 channel. Set the bit in apci3120_set_chanlist() if needed.
The callers write the mode register after setting any additional bits,
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, 4 insertions, 0 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c index f258ceb144fb..ec6623372721 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3120.c +++ b/drivers/staging/comedi/drivers/addi_apci_3120.c @@ -307,6 +307,10 @@ static void apci3120_set_chanlist(struct comedi_device *dev, /* set scan length (PR) and scan start (PA) */ devpriv->ctrl = APCI3120_CTRL_PR(n_chan - 1) | APCI3120_CTRL_PA(0); outw(devpriv->ctrl, dev->iobase + APCI3120_CTRL_REG); + + /* enable chanlist scanning if necessary */ + if (n_chan > 1) + devpriv->mode |= APCI3120_MODE_SCAN_ENA; } #include "addi-data/hwdrv_apci3120.c" |