diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-10-22 15:36:41 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-29 16:03:12 +0800 |
commit | 2e7b65e4bbe3b35ece1b8c8179a77071be042c38 (patch) | |
tree | c96f2636c13d8cbcc2280db0f135bc90555eee3a | |
parent | b45a7beb3bc3c43e6abea5b3da9c8df8377540e8 (diff) | |
download | op-kernel-dev-2e7b65e4bbe3b35ece1b8c8179a77071be042c38.zip op-kernel-dev-2e7b65e4bbe3b35ece1b8c8179a77071be042c38.tar.gz |
staging: comedi: das16: 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 <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/comedi/drivers/das16.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c index 5d47d0a..aa9e3e1 100644 --- a/drivers/staging/comedi/drivers/das16.c +++ b/drivers/staging/comedi/drivers/das16.c @@ -541,6 +541,7 @@ static void das16_interrupt(struct comedi_device *dev) struct comedi_cmd *cmd = &async->cmd; unsigned long spin_flags; unsigned long dma_flags; + unsigned int nsamples; int num_bytes, residue; int buffer_index; @@ -583,8 +584,9 @@ static void das16_interrupt(struct comedi_device *dev) spin_unlock_irqrestore(&dev->spinlock, spin_flags); - cfc_write_array_to_buffer(s, - devpriv->dma_buffer[buffer_index], num_bytes); + nsamples = num_bytes / bytes_per_sample(s); + comedi_buf_write_samples(s, devpriv->dma_buffer[buffer_index], + nsamples); comedi_handle_events(dev, s); } |