staging: comedi: adl_pci6208: save raw data for analog output readback

This driver munges the raw data from the comedi core into its two's
complement form before writing it to the hardware. The last value
written to the hardware is saved in the private data for readback.

Since the comedi core always expects the data to be in offset binary
coding, make sure to save the un-munged value for readback.

Also, prefetch the current readback value before attempting to update
the hardware. This ensures that the readback value is correct if no
values are actually written.

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/adl_pci6208.c b/drivers/staging/comedi/drivers/adl_pci6208.c
index 60f1f5c9532d70d87def20edcf5cfc9ce3d80e95..9150582fad068ef59b645fae89df71d4a858df91 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci6208.c
+++ b/drivers/staging/comedi/drivers/adl_pci6208.c
@@ -88,21 +88,21 @@ static int pci6208_ao_winsn(struct comedi_device *dev,
 {
        struct pci6208_private *devpriv = dev->private;
        int chan = CR_CHAN(insn->chanspec);
-       unsigned long invert = 1 << (16 - 1);
-       unsigned long value = 0;
+       unsigned int invert = 1 << (16 - 1);
+       unsigned int val = devpriv->ao_readback[chan];
        unsigned short status;
        int i;
 
        for (i = 0; i < insn->n; i++) {
-               value = data[i] ^ invert;
+               val = data[i];
 
                do {
                        status = inw(dev->iobase + PCI6208_AO_STATUS);
                } while (status & PCI6208_AO_STATUS_DATA_SEND);
 
-               outw(value, dev->iobase + PCI6208_AO_CONTROL(chan));
+               outw(val ^ invert, dev->iobase + PCI6208_AO_CONTROL(chan));
        }
-       devpriv->ao_readback[chan] = value;
+       devpriv->ao_readback[chan] = val;
 
        return insn->n;
 }