Skip to content

Commit f81ac41

Browse files
bigguinessgregkh
authored andcommitted
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: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 504d023 commit f81ac41

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/staging/comedi/drivers/usbduxfast.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,19 +249,17 @@ static void usbduxfast_ai_handle_urb(struct comedi_device *dev,
249249
devpriv->ignore--;
250250
} else {
251251
unsigned int nbytes = urb->actual_length;
252+
unsigned int nsamples = nbytes / bytes_per_sample(s);
252253

253254
if (cmd->stop_src == TRIG_COUNT) {
254-
unsigned int nsamples = nbytes / bytes_per_sample(s);
255-
256255
if (devpriv->ai_sample_count < nsamples) {
257256
nsamples = devpriv->ai_sample_count;
258257
async->events |= COMEDI_CB_EOA;
259258
}
260259
devpriv->ai_sample_count -= nsamples;
261-
nbytes = nsamples * bytes_per_sample(s);
262260
}
263261

264-
cfc_write_array_to_buffer(s, urb->transfer_buffer, nbytes);
262+
comedi_buf_write_samples(s, urb->transfer_buffer, nsamples);
265263
}
266264

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

0 commit comments

Comments
 (0)