[PATCH 51/51 v2] staging: comedi: ni_labpc: fix labpc_calib_insn_write()

H Hartley Sweeten hsweeten at visionengravers.com
Fri Mar 22 16:58:55 UTC 2013


The comedi core expects the (*insn_write) operations to write insn->n
values and return the number of values actually wrote.

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 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index e3f7e45..aa76f6d 100644
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -1545,10 +1545,13 @@ static int labpc_calib_insn_write(struct comedi_device *dev,
 				  struct comedi_insn *insn,
 				  unsigned int *data)
 {
-	int channel = CR_CHAN(insn->chanspec);
+	unsigned int chan = CR_CHAN(insn->chanspec);
+	int i;
 
-	write_caldac(dev, channel, data[0]);
-	return 1;
+	for (i = 0; i < insn->n; i++)
+		write_caldac(dev, chan, data[i]);
+
+	return insn->n;
 }
 
 static int labpc_calib_insn_read(struct comedi_device *dev,
-- 
1.8.1.4




More information about the devel mailing list