aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers/ni_labpc.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-03-26 10:27:11 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-26 16:14:51 -0700
commit198ac9dc7f0d06cd760d376c6a6c6217c5968d4a (patch)
tree4ef32983cf8306261d5c485e6799fdc78a91b573 /drivers/staging/comedi/drivers/ni_labpc.c
parent43d092c67740704c9a8d04da2ca070bfca34207a (diff)
staging: comedi: ni_labpc: fix labpc_calib_insn_read()
The comedi core expects the (*insn_read) operations to read insn->n values and return the number of values actually read. Make this function work like the core expects. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_labpc.c')
-rw-r--r--drivers/staging/comedi/drivers/ni_labpc.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index b0ec088a728..bae72eb7345 100644
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -1551,10 +1551,13 @@ static int labpc_calib_insn_read(struct comedi_device *dev,
unsigned int *data)
{
struct labpc_private *devpriv = dev->private;
+ unsigned int chan = CR_CHAN(insn->chanspec);
+ int i;
- data[0] = devpriv->caldac[CR_CHAN(insn->chanspec)];
+ for (i = 0; i < insn->n; i++)
+ data[i] = devpriv->caldac[chan];
- return 1;
+ return insn->n;
}
static int labpc_eeprom_insn_write(struct comedi_device *dev,