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

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

staging: comedi: quatech_daqp_cs: fix daqp_ao_insn_write() 



The (*insn_write) functions are expected to write 'insn->n' number
of samples to the channel. Fix this function so it works as the
comedi core expects.

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

drivers/staging/comedi/drivers/quatech_daqp_cs.c

+14 −13
Original line number Diff line number Diff line
@@ -644,31 +644,32 @@ static int daqp_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
	return 0;

}



/* Single-shot analog output routine */



static int daqp_ao_insn_write(struct comedi_device *dev,

			      struct comedi_subdevice *s,

			      struct comedi_insn *insn, unsigned int *data)

			      struct comedi_insn *insn,

			      unsigned int *data)

{

	struct daqp_private *devpriv = dev->private;

	int d;

	unsigned int chan;

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

	unsigned int val;

	int i;



	if (devpriv->stop)

		return -EIO;



	chan = CR_CHAN(insn->chanspec);

	d = data[0];

	d &= 0x0fff;

	d ^= 0x0800;		/* Flip the sign */

	d |= chan << 12;



	/* Make sure D/A update mode is direct update */

	outb(0, dev->iobase + DAQP_AUX);



	outw(d, dev->iobase + DAQP_DA);

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

		val = data[0];

		val &= 0x0fff;

		val ^= 0x0800;		/* Flip the sign */

		val |= (chan << 12);



	return 1;

		outw(val, dev->iobase + DAQP_DA);

	}



	return insn->n;

}



static int daqp_di_insn_bits(struct comedi_device *dev,