iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: comedi: me_daq: fix me_ao_insn_read()

Browse Source 
This function is supposed to return the analog output value for
a specified channel. The channel number is packed in insn->chanspec,
which is an unsigned int, and unpacked using the CR_CHAN() macro.

Currently this function is trying to use the chanspec as an array.
This works only if a single data value is read.

Fix the function so that the desired channel is determined and all
the data returned is from that channel.

Also, fix the return. The comedi core expects insn_read functions to
return the number of data values (insn->n).

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>
This commit is contained in:
H Hartley Sweeten 2012-10-25 15:09:33 -07:00 committed by Greg Kroah-Hartman
parent e439379262
commit 91b0da5707
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/comedi/drivers/me_daq.c
View File

@ -469,20 +469,19 @@ static int me_ao_insn_write(struct comedi_device *dev,
return i;
}
/* Analog output readback */
static int me_ao_insn_read(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_insn *insn,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{
struct me_private_data *dev_private = dev->private;
unsigned int chan = CR_CHAN(insn->chanspec);
int i;
for (i = 0; i < insn->n; i++) {
data[i] =
dev_private->ao_readback[CR_CHAN((&insn->chanspec)[i])];
}
for (i = 0; i < insn->n; i++)
data[i] = dev_private->ao_readback[chan];
return 1;
return insn->n;
}
/*