---

yaml --- r: 364012 b: refs/heads/master c: aac49c3 h: refs/heads/master v: v3
git-mirror · Apr 9, 2013 · b294565 · b294565
1 parent 3860562
commit b294565
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;