shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-04 02:02:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: das08: fix bug in das08_ao_winsn()

Browse Source 
The comedi core expects (*insn_write) functions to write insn->n values
to the hardware and return the number of values written.

Currently, this function only writes the first value. Fix it to work
like the core expects.

For aesthetics, rename the function and tidy it up a bit.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten
2014-08-25 16:04:36 -07:00
committed by Greg Kroah-Hartman
parent 073d463260
commit 862f773639
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/staging/comedi/drivers/das08.c
View File

@@ -369,19 +369,18 @@ static void das08_ao_initialize(struct comedi_device *dev,
das08_ao_set_data(dev, n, data);
}
static int das08_ao_winsn(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
static int das08_ao_insn_write(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{
unsigned int n;
unsigned int chan;
unsigned int chan = CR_CHAN(insn->chanspec);
int i;
chan = CR_CHAN(insn->chanspec);
for (i = 0; i < insn->n; i++)
das08_ao_set_data(dev, chan, data[i]);
for (n = 0; n < insn->n; n++)
das08_ao_set_data(dev, chan, *data);
return n;
return insn->n;
}
static int das08_ao_rinsn(struct comedi_device *dev,
@@ -498,7 +497,7 @@ int das08_common_attach(struct comedi_device *dev, unsigned long iobase)
s->n_chan = 2;
s->maxdata = (1 << thisboard->ao_nbits) - 1;
s->range_table = &range_bipolar5;
s->insn_write = das08_ao_winsn;
s->insn_write = das08_ao_insn_write;
s->insn_read = das08_ao_rinsn;
das08_ao_initialize(dev, s);
} else {