---

yaml --- r: 325134 b: refs/heads/master c: ae479ee h: refs/heads/master v: v3
git-mirror · Sep 11, 2012 · 1e30481 · 1e30481
1 parent 8fe371e
commit 1e30481
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9852d13745bef4158e152c3b00f0678ca1b5ccb7
+refs/heads/master: ae479ee562cf3d7d33eebbb30e6c3105475ed5b8
diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -855,16 +855,18 @@ static int pci9111_ai_insn_read(struct comedi_device *dev,
 				struct comedi_subdevice *s,
 				struct comedi_insn *insn, unsigned int *data)
 {
+	unsigned int chan = CR_CHAN(insn->chanspec);
+	unsigned int range = CR_RANGE(insn->chanspec);
 	unsigned int maxdata = s->maxdata;
 	unsigned int invert = (maxdata + 1) >> 1;
 	unsigned int shift = (maxdata == 0xffff) ? 0 : 4;
 	int timeout;
 	int i;
 
-	pci9111_ai_channel_set(CR_CHAN((&insn->chanspec)[0]));
+	pci9111_ai_channel_set(chan);
 
-	if ((pci9111_ai_range_get()) != CR_RANGE((&insn->chanspec)[0]))
-		pci9111_ai_range_set(CR_RANGE((&insn->chanspec)[0]));
+	if ((pci9111_ai_range_get()) != range)
+		pci9111_ai_range_set(range);
 
 	pci9111_fifo_reset();