From 0340e05b8d8c2d8f863dd52c5280610805fd51e4 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 26 Mar 2013 10:27:11 -0700 Subject: [PATCH] --- yaml --- r: 363763 b: refs/heads/master c: 198ac9dc7f0d06cd760d376c6a6c6217c5968d4a h: refs/heads/master i: 363761: b86ef7a871122dd8948e4d39813b684c008c5b93 363759: be306f841603b405d3e05da49532c54bb9f17dd9 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_labpc.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) 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,