From b294565d2300012c4c23226e513d456900cacbef Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 8 Apr 2013 18:21:02 -0700 Subject: [PATCH] --- yaml --- r: 364012 b: refs/heads/master c: aac49c3417dc9378cbcead70c671d79cd626709f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/rti800.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b0f084007494..0e3783fcba09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7c1161dfd98c00a1fa4691057b7418b8c26a1f2 +refs/heads/master: aac49c3417dc9378cbcead70c671d79cd626709f diff --git a/trunk/drivers/staging/comedi/drivers/rti800.c b/trunk/drivers/staging/comedi/drivers/rti800.c index d788c19e7fb1..0084038a8b0d 100644 --- a/trunk/drivers/staging/comedi/drivers/rti800.c +++ b/trunk/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;