diff --git a/[refs] b/[refs]
index 464b0fc0389c..19dc77642c2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43d092c67740704c9a8d04da2ca070bfca34207a
+refs/heads/master: 198ac9dc7f0d06cd760d376c6a6c6217c5968d4a
diff --git a/trunk/drivers/staging/comedi/drivers/ni_labpc.c b/trunk/drivers/staging/comedi/drivers/ni_labpc.c
index b0ec088a7285..bae72eb73451 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/trunk/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,