From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Fri, 31 Oct 2014 19:04:30 +0000 (-0700)
Subject: staging: comedi: das1800: use sample manipulation helpers
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5035a96f3640ee4705f69287726bfcc598212717;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

staging: comedi: das1800: use sample manipulation helpers

Use the recently added sample manipulation helpers to remove the hardcoded
assumption of the sample size.

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>
---

diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c
index bf8bfcf7034d..03b1ff9de92c 100644
--- a/drivers/staging/comedi/drivers/das1800.c
+++ b/drivers/staging/comedi/drivers/das1800.c
@@ -535,7 +535,7 @@ static void das1800_flush_dma_channel(struct comedi_device *dev,
 
 	/*  figure out how many points to read */
 	num_bytes = devpriv->dma_transfer_size - get_dma_residue(channel);
-	num_samples = num_bytes / sizeof(short);
+	num_samples = comedi_bytes_to_samples(s, num_bytes);
 
 	/* if we only need some of the points */
 	if (cmd->stop_src == TRIG_COUNT && devpriv->count < num_samples)