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

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

staging: comedi: usbdux: use comedi_buf_read_samples() 



Use comedi_buf_read_samples() to read the analog output samples from
the async buffer. That function will set the COMEDI_CB_BLOCK event
when samples are read from the async buffer.

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 dec1a266

drivers/staging/comedi/drivers/usbdux.c

+1 −2
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ static void usbduxsub_ao_handle_urb(struct comedi_device *dev, 
			unsigned int chan = CR_CHAN(cmd->chanlist[i]);

			unsigned short val;



			if (!comedi_buf_get(s, &val)) {

			if (!comedi_buf_read_samples(s, &val, 1)) {

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

				async->events |= COMEDI_CB_OVERFLOW;

				return;
@@ -425,7 +425,6 @@ static void usbduxsub_ao_handle_urb(struct comedi_device *dev, 
			*datap++ = chan << 6;

			s->readback[chan] = val;

		}

		async->events |= COMEDI_CB_BLOCK;

	}



	/* if command is still running, resubmit urb for BULK transfer */