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

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

staging: comedi: amplc_dio200_common: use comedi_buf_write_samples() 



The dev->read_subdev used in this driver for async commands 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 async events will set properly by the core. A dev_warn() message will
also be output by the core if the buffer overflows. Remove the unnecessary
events and dev_err() message 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 4c704690

drivers/staging/comedi/drivers/amplc_dio200_common.c

+3 −9
Original line number Diff line number Diff line
@@ -267,14 +267,8 @@ static void dio200_read_scan_intr(struct comedi_device *dev, 
		if (triggered & (1U << ch))

			val |= (1U << n);

	}

	/* Write the scan to the buffer. */

	if (comedi_buf_put(s, val)) {

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

	} else {

		/* Error!  Stop acquisition.  */

		s->async->events |= COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW;

		dev_err(dev->class_dev, "buffer overflow\n");

	}



	comedi_buf_write_samples(s, &val, 1);



	/* Check for end of acquisition. */

	if (cmd->stop_src == TRIG_COUNT) {
@@ -463,7 +457,7 @@ static int dio200_subdev_intr_init(struct comedi_device *dev, 
		dio200_write8(dev, subpriv->ofs, 0);



	s->type = COMEDI_SUBD_DI;

	s->subdev_flags = SDF_READABLE | SDF_CMD_READ;

	s->subdev_flags = SDF_READABLE | SDF_CMD_READ | SDF_PACKED;

	if (board->has_int_sce) {

		s->n_chan = DIO200_MAX_ISNS;

		s->len_chanlist = DIO200_MAX_ISNS;