From f6266a41d820feaa7b7febe122b285e336e40bfd Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 10 Nov 2014 17:57:56 -0700 Subject: [PATCH] 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 --- drivers/staging/comedi/drivers/adl_pci9118.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 -- 2.34.1