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

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

staging: comedi: pcmmio: use comedi_buf_write_samples() 



The dev->read_subdev used in this driver for async commands returns 32-bit samples
and should have the SDF_LSAMPL subdev_flag set. It also returns the full scan with
each sample so it should have the SDF_PACKED subdev_flag set.

Add the missing subdev_flags and use comedi_buf_write_samples() to add the sample
to the async buffer.

The COMEDI_CB_BLOCK and COMEDI_CB_EOS events will be automatically handled by the
core. Remove the unnecessary events in the driver.

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 dbe81a93

drivers/staging/comedi/drivers/pcmmio.c

+2 −5
Original line number Diff line number Diff line
@@ -356,10 +356,7 @@ static void pcmmio_handle_dio_intr(struct comedi_device *dev, 
			val |= (1 << i);

	}



	/* Write the scan to the buffer. */

	if (comedi_buf_put(s, val) &&

	    comedi_buf_put(s, val >> 16))

		s->async->events |= (COMEDI_CB_BLOCK | COMEDI_CB_EOS);

	comedi_buf_write_samples(s, &val, 1);



	/* Check for end of acquisition. */

	if (cmd->stop_src == TRIG_COUNT && devpriv->stop_count > 0) {
@@ -764,7 +761,7 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
	s->insn_config	= pcmmio_dio_insn_config;

	if (dev->irq) {

		dev->read_subdev = s;

		s->subdev_flags	|= SDF_CMD_READ;

		s->subdev_flags	|= SDF_CMD_READ | SDF_LSAMPL | SDF_PACKED;

		s->len_chanlist	= s->n_chan;

		s->cancel	= pcmmio_cancel;

		s->do_cmd	= pcmmio_cmd;