From: H Hartley Sweeten Date: Wed, 22 Oct 2014 22:36:41 +0000 (-0700) Subject: staging: comedi: das16: use comedi_buf_write_samples() X-Git-Tag: v3.19-rc1~66^2~761 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2e7b65e4bbe3b35ece1b8c8179a77071be042c38;p=karo-tx-linux.git 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c index 5d47d0a1d45f..aa9e3e10d59d 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); }