leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: adv_pci1710: fix analog output readback value

Browse Source 
The last value written to a analog output channel is cached in the
private data of this driver for readback.

Currently, the wrong value is cached in the (*insn_write) functions.
The current code stores the data[n] value for readback afer the loop
has written all the values. At this time 'n' points past the end of
the data array.

Fix the functions by using a local variable to hold the data being
written to the analog output channel. This variable is then used
after the loop is complete to store the readback value. The current
value is retrieved before the loop in case no values are actually
written..

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-02-05 14:59:53 -07:00 committed by Greg Kroah-Hartman
parent 7a081ea20e
commit 1e85c1ea1f
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/staging/comedi/drivers/adv_pci1710.c
View File

@ -494,6 +494,7 @@ static int pci171x_insn_write_ao(struct comedi_device *dev,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
struct pci1710_private *devpriv = dev->private; struct pci1710_private *devpriv = dev->private;
unsigned int val;
int n, chan, range, ofs; int n, chan, range, ofs;
chan = CR_CHAN(insn->chanspec); chan = CR_CHAN(insn->chanspec);
@ -509,11 +510,14 @@ static int pci171x_insn_write_ao(struct comedi_device *dev,
outw(devpriv->da_ranges, dev->iobase + PCI171x_DAREF); outw(devpriv->da_ranges, dev->iobase + PCI171x_DAREF);
ofs = PCI171x_DA1; ofs = PCI171x_DA1;
} }
val = devpriv->ao_data[chan];
for (n = 0; n < insn->n; n++) for (n = 0; n < insn->n; n++) {
outw(data[n], dev->iobase + ofs); val = data[n];
outw(val, dev->iobase + ofs);
}
devpriv->ao_data[chan] = data[n]; devpriv->ao_data[chan] = val;
return n; return n;
@ -679,6 +683,7 @@ static int pci1720_insn_write_ao(struct comedi_device *dev,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
struct pci1710_private *devpriv = dev->private; struct pci1710_private *devpriv = dev->private;
unsigned int val;
int n, rangereg, chan; int n, rangereg, chan;
chan = CR_CHAN(insn->chanspec); chan = CR_CHAN(insn->chanspec);
@ -688,13 +693,15 @@ static int pci1720_insn_write_ao(struct comedi_device *dev,
outb(rangereg, dev->iobase + PCI1720_RANGE); outb(rangereg, dev->iobase + PCI1720_RANGE);
devpriv->da_ranges = rangereg; devpriv->da_ranges = rangereg;
} }
val = devpriv->ao_data[chan];
for (n = 0; n < insn->n; n++) { for (n = 0; n < insn->n; n++) {
outw(data[n], dev->iobase + PCI1720_DA0 + (chan << 1)); val = data[n];
outw(val, dev->iobase + PCI1720_DA0 + (chan << 1));
outb(0, dev->iobase + PCI1720_SYNCOUT); /* update outputs */ outb(0, dev->iobase + PCI1720_SYNCOUT); /* update outputs */
} }
devpriv->ao_data[chan] = data[n]; devpriv->ao_data[chan] = val;
return n; return n;
} }