]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: pcmuio: sample types are unsigned
authorIan Abbott <abbotti@mev.co.uk>
Wed, 16 Oct 2013 13:40:33 +0000 (14:40 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 16 Oct 2013 19:48:31 +0000 (12:48 -0700)
Sample values in comedi are generally represented as unsigned values.
Change `pcmuio_handle_intr_subdev()` in the "pcmuio" module to use
unsigned sample values for consistency.

Also, make the order in which `pcmuio_handle_intr_subdev()` writes the
two sample values (each actually containing up to 16 1-bit sample
values) independent of the host byte ordering.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/pcmuio.c

index 67e2bb1d66f00c61357780d7e95fa86d8275530d..954fa96a50ac766df3ed8d257704e46442302293 100644 (file)
@@ -315,8 +315,8 @@ static void pcmuio_handle_intr_subdev(struct comedi_device *dev,
        }
 
        /* Write the scan to the buffer. */
-       if (comedi_buf_put(s->async, ((short *)&val)[0]) &&
-           comedi_buf_put(s->async, ((short *)&val)[1])) {
+       if (comedi_buf_put(s->async, val) &&
+           comedi_buf_put(s->async, val >> 16)) {
                s->async->events |= (COMEDI_CB_BLOCK | COMEDI_CB_EOS);
        } else {
                /* Overflow! Stop acquisition!! */