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

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

staging: comedi: usbduxfast: use comedi_buf_write_samples() 



Use comedi_buf_write_samples() to add the samples to the async buffer.
That function will determining the number of bytes to add based on the
bytes_per_sample().

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 504d0239

drivers/staging/comedi/drivers/usbduxfast.c

+2 −4
Original line number Diff line number Diff line
@@ -249,19 +249,17 @@ static void usbduxfast_ai_handle_urb(struct comedi_device *dev, 
		devpriv->ignore--;

	} else {

		unsigned int nbytes = urb->actual_length;



		if (cmd->stop_src == TRIG_COUNT) {

		unsigned int nsamples = nbytes / bytes_per_sample(s);



		if (cmd->stop_src == TRIG_COUNT) {

			if (devpriv->ai_sample_count < nsamples) {

				nsamples = devpriv->ai_sample_count;

				async->events |= COMEDI_CB_EOA;

			}

			devpriv->ai_sample_count -= nsamples;

			nbytes = nsamples * bytes_per_sample(s);

		}



		cfc_write_array_to_buffer(s, urb->transfer_buffer, nbytes);

		comedi_buf_write_samples(s, urb->transfer_buffer, nsamples);

	}



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