staging: comedi: das16: use comedi_buf_write_samples()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Wed, 22 Oct 2014 22:36:41 +0000 (15:36 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Oct 2014 08:03:12 +0000 (16:03 +0800)
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>
drivers/staging/comedi/drivers/das16.c

index 5d47d0a1d45f10dff9226826b99cd52054927b80..aa9e3e10d59d358abba58451de5c77e2e06d13c8 100644 (file)
@@ -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);
 }