Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61e9332b authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: me_daq: fix bug in me_ao_insn_write() 



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. The core also
validates all the data values so the extra masking with s->maxdata is
not needed. Fix this function to work like the core expects.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e8928754

drivers/staging/comedi/drivers/me_daq.c

+5 −3
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ static int me_ao_insn_write(struct comedi_device *dev, 
	struct me_private_data *dev_private = dev->private;

	unsigned int chan = CR_CHAN(insn->chanspec);

	unsigned int rang = CR_RANGE(insn->chanspec);

	unsigned int val = dev_private->ao_readback[chan];

	int i;



	/* Enable all DAC */
@@ -353,10 +354,11 @@ static int me_ao_insn_write(struct comedi_device *dev, 


	/* Set data register */

	for (i = 0; i < insn->n; i++) {

		writew((data[0] & s->maxdata),

		       dev->mmio + ME_DAC_DATA_A + (chan << 1));

		dev_private->ao_readback[chan] = (data[0] & s->maxdata);

		val = data[i];



		writew(val, dev->mmio + ME_DAC_DATA_A + (chan << 1));

	}

	dev_private->ao_readback[chan] = val;



	/* Update dac with data registers */

	readw(dev->mmio + ME_DAC_UPDATE);