diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-08 18:21:02 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-09 16:29:25 -0700 |
| commit | aac49c3417dc9378cbcead70c671d79cd626709f (patch) | |
| tree | 97de3ad5e279b73083f3be34e9377da4479802dd /drivers/staging/comedi/drivers/rti800.c | |
| parent | c7c1161dfd98c00a1fa4691057b7418b8c26a1f2 (diff) | |
staging: comedi: rti800: swap val and mask when reading ai data
The (mask & val) operation when reading the high 4-bits of the analog
data looks strange. Change it to (val & mask).
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>
Diffstat (limited to 'drivers/staging/comedi/drivers/rti800.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/rti800.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/rti800.c b/drivers/staging/comedi/drivers/rti800.c index d788c19e7fb1..0084038a8b0d 100644 --- a/drivers/staging/comedi/drivers/rti800.c +++ b/drivers/staging/comedi/drivers/rti800.c @@ -217,7 +217,7 @@ static int rti800_ai_insn_read(struct comedi_device *dev, return ret; data[i] = inb(dev->iobase + RTI800_ADCLO); - data[i] |= (0xf & inb(dev->iobase + RTI800_ADCHI)) << 8; + data[i] |= (inb(dev->iobase + RTI800_ADCHI) & 0xf) << 8; if (devpriv->adc_2comp) data[i] ^= 0x800; |