staging: comedi: das16: use sample manipulation helpers
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Fri, 31 Oct 2014 19:04:31 +0000 (12:04 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 4 Nov 2014 00:34:17 +0000 (16:34 -0800)
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>
drivers/staging/comedi/drivers/das16.c

index 26f54aa9d41c01ed510ecc3bab026fab3525f612..8de27053666f226f424be1d25357a135aa871ff1 100644 (file)
@@ -863,8 +863,9 @@ static void das16_ai_munge(struct comedi_device *dev,
                           unsigned int num_bytes,
                           unsigned int start_chan_index)
 {
-       unsigned int i, num_samples = num_bytes / sizeof(short);
        unsigned short *data = array;
+       unsigned int num_samples = comedi_bytes_to_samples(s, num_bytes);
+       unsigned int i;
 
        for (i = 0; i < num_samples; i++) {
                data[i] = le16_to_cpu(data[i]);