瀏覽代碼

staging: comedi: ni_labpc: fix labpc_calib_insn_write()

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.

As Ian Abbott pointed out for the eeprom writes, we really only need
to write the last value to the caldac. The preceding data would be
overwritten anyway.

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>
H Hartley Sweeten 12 年之前
父節點
當前提交
7c00782b1d
共有 1 個文件被更改,包括 9 次插入3 次删除
  1. 9 3
      drivers/staging/comedi/drivers/ni_labpc.c

+ 9 - 3
drivers/staging/comedi/drivers/ni_labpc.c

@@ -1539,10 +1539,16 @@ static int labpc_calib_insn_write(struct comedi_device *dev,
 				  struct comedi_insn *insn,
 				  struct comedi_insn *insn,
 				  unsigned int *data)
 				  unsigned int *data)
 {
 {
-	int channel = CR_CHAN(insn->chanspec);
+	unsigned int chan = CR_CHAN(insn->chanspec);
 
 
-	write_caldac(dev, channel, data[0]);
-	return 1;
+	/*
+	 * Only write the last data value to the caldac. Preceding
+	 * data would be overwritten anyway.
+	 */
+	if (insn->n > 0)
+		write_caldac(dev, chan, data[insn->n - 1]);
+
+	return insn->n;
 }
 }
 
 
 static int labpc_calib_insn_read(struct comedi_device *dev,
 static int labpc_calib_insn_read(struct comedi_device *dev,