[PATCH 48/51 v2] staging: comedi: ni_labpc: fix labpc_eeprom_insn_read()
H Hartley Sweeten
hsweeten at visionengravers.com
Fri Mar 22 16:57:48 UTC 2013
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 at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
drivers/staging/comedi/drivers/ni_labpc.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index 234f85e..0afcede 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,
--
1.8.1.4
More information about the devel
mailing list