Merge remote-tracking branch 'staging/staging-next'

[karo-tx-linux.git] / drivers / staging / comedi / drivers / rti800.c

diff --git a/drivers/staging/comedi/drivers/rti800.c b/drivers/staging/comedi/drivers/rti800.c
index 528e0697c9c7ae038b6a2d0d9e0b521252855493..cd61d2645af452f31e314c8232554499bed189ab 100644 (file)
--- a/drivers/staging/comedi/drivers/rti800.c
+++ b/drivers/staging/comedi/drivers/rti800.c
@@ -189,17 +189,21 @@ static int rti800_ai_insn_read(struct comedi_device *dev,
        }
 
        for (i = 0; i < insn->n; i++) {
+               unsigned int val;
+
                outb(0, dev->iobase + RTI800_CONVERT);
 
                ret = comedi_timeout(dev, s, insn, rti800_ai_eoc, 0);
                if (ret)
                        return ret;
 
-               data[i] = inb(dev->iobase + RTI800_ADCLO);
-               data[i] |= (inb(dev->iobase + RTI800_ADCHI) & 0xf) << 8;
+               val = inb(dev->iobase + RTI800_ADCLO);
+               val |= (inb(dev->iobase + RTI800_ADCHI) & 0xf) << 8;
 
                if (devpriv->adc_2comp)
-                       data[i] ^= 0x800;
+                       val = comedi_offset_munge(s, val);
+
+               data[i] = val;
        }
 
        return insn->n;
@@ -222,7 +226,7 @@ static int rti800_ao_insn_write(struct comedi_device *dev,
                s->readback[chan] = val;
 
                if (devpriv->dac_2comp[chan])
-                       val ^= 0x800;
+                       val = comedi_offset_munge(s, val);
 
                outb(val & 0xff, dev->iobase + reg_lo);
                outb((val >> 8) & 0xff, dev->iobase + reg_hi);