OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: comedi: ni_mio_common: use insn->n in ni_calib_insn_read() 

The `insn_read` handler for the calibration subdevice
(`ni_calib_insn_read()`) currently ignores `insn->n` (the number of
samples to read) and assumes a single sample is to be read into
`data[0]`.  Fortunately, the Comedi core ensures that `data[]` has a
length of at least 16, so there is no problem with array bounds.

The usual Comedi convention for `insn_read` handlers is to read the same
channel `insn->n` times into successive elements of `data[]`, so let's
do that.

Also, follow the usual Comedi convention and return `insn->n` from the
handler to indicate success (although any non-negative value will do).

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2019-03-19 16:54:42 +00:00 committed by Greg Kroah-Hartman
parent fe57d1e113
commit 776d25ff5b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/comedi/drivers/ni_mio_common.c
View File

@ -4409,10 +4409,12 @@ static int ni_calib_insn_read(struct comedi_device *dev,
unsigned int *data)
{
struct ni_private *devpriv = dev->private;
unsigned int i;
data[0] = devpriv->caldacs[CR_CHAN(insn->chanspec)];
for (i = 0; i < insn->n; i++)
data[0] = devpriv->caldacs[CR_CHAN(insn->chanspec)];
return 1;
return insn->n;
}
static void caldac_setup(struct comedi_device *dev, struct comedi_subdevice *s)