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

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

staging: comedi: c6xdigio: use comedi_offset_munge() 



The value read from the encoders is in two's complement format. Use
the comedi_offset_munge() helper to convert the value to offset binary.

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 c034f1f6

drivers/staging/comedi/drivers/c6xdigio.c

+10 −5
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static int c6xdigio_encoder_read(struct comedi_device *dev, 


	c6xdigio_write_data(dev, 0x00, 0x80);



	return val ^ 0x800000;

	return val;

}



static int c6xdigio_pwm_insn_write(struct comedi_device *dev,
@@ -177,12 +177,17 @@ static int c6xdigio_encoder_insn_read(struct comedi_device *dev, 
				      unsigned int *data)

{

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

	int n;

	unsigned int val;

	int i;



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

		data[n] = (c6xdigio_encoder_read(dev, chan) & 0xffffff);

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

		val = c6xdigio_encoder_read(dev, chan);



		/* munge two's complement value to offset binary */

		data[i] = comedi_offset_munge(s, val);

	}



	return n;

	return insn->n;

}



static void c6xdigio_init(struct comedi_device *dev)