diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-03-22 09:57:48 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 11:43:02 -0700 |
commit | 1330af4c7deedd0b6d1ba43734d7e4eb1a83a491 (patch) | |
tree | e3a909a7b8312864cf7ce81cf7bc669da4c5ee54 | |
parent | 63a93381ef17902c1d8dd33506163c43cf2178be (diff) |
staging: comedi: ni_labpc: fix labpc_eeprom_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>
-rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc.c | 7 |
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 234f85e0f2f2..0afcede602ec 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c @@ -1591,10 +1591,13 @@ static int labpc_eeprom_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->eeprom_data[CR_CHAN(insn->chanspec)]; + for (i = 0; i < insn->n; i++) + data[i] = devpriv->eeprom_data[chan]; - return 1; + return insn->n; } int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, |