From: H Hartley Sweeten Date: Tue, 11 Nov 2014 00:57:56 +0000 (-0700) Subject: staging: comedi: adl_pci9118: use comedi_bytes_to_samples() X-Git-Tag: firefly_0821_release~176^2~2665^2~154 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f6266a41d820feaa7b7febe122b285e336e40bfd;p=firefly-linux-kernel-4.4.55.git staging: comedi: adl_pci9118: use comedi_bytes_to_samples() Remove the assumption of the sample size by using the comedi_bytes_to_samples() helper function to convert the number of bytes to the number of samples. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c index b527748658f0..498e0c7775e5 100644 --- a/drivers/staging/comedi/drivers/adl_pci9118.c +++ b/drivers/staging/comedi/drivers/adl_pci9118.c @@ -607,11 +607,9 @@ static void interrupt_pci9118_ai_dma(struct comedi_device *dev, struct pci9118_private *devpriv = dev->private; struct comedi_cmd *cmd = &s->async->cmd; struct pci9118_dmabuf *dmabuf = &devpriv->dmabuf[devpriv->dma_actbuf]; - unsigned int nsamples; + unsigned int nsamples = comedi_bytes_to_samples(s, dmabuf->use_size); unsigned int next_dma_buf; - nsamples = dmabuf->use_size >> 1; /* number of received samples */ - if (devpriv->dma_doublebuf) { /* * switch DMA buffers if is used * double buffering