]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: pcmad: fix analog input data on pcmad12
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Wed, 5 Jun 2013 22:38:57 +0000 (15:38 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Jun 2013 19:01:35 +0000 (12:01 -0700)
According to the PCM-A/D-12/16 Operations Manual:

NOTE: On the PCM-A/D-12 the lower nibble of the hex value will always be 0.

Fix the pcmad_ai_insn_read() function to properly handle this by shifting
the data after it has been read.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/pcmad.c

index 8028e476bff32d222005c067d3f1a063aea00bbd..c9af0aa3802788de987ed8bf80d4b952d52927e7 100644 (file)
@@ -104,6 +104,10 @@ static int pcmad_ai_insn_read(struct comedi_device *dev,
                val = inb(dev->iobase + PCMAD_LSB) |
                      (inb(dev->iobase + PCMAD_MSB) << 8);
 
+               /* data is shifted on the pcmad12, fix it */
+               if (s->maxdata == 0x0fff)
+                       val >>= 4;
+
                if (pcmad_range_is_bipolar(s, range)) {
                        /* munge the two's complement value */
                        val ^= ((s->maxdata + 1) >> 1);