---

yaml --- r: 325119 b: refs/heads/master c: 2084fd1 h: refs/heads/master i: 325117: 6285b63 325115: a97d4c3 325111: d567afb 325103: e39ce7f 325087: b4159ea 325055: 11812dd 324991: 2df8fb1 324863: 14aac42 324607: 3e275cd v: v3
git-mirror · Sep 11, 2012 · 4aef51d · 4aef51d
1 parent 79bcbe6
commit 4aef51d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b7044dcfc1c1df1b8858ead6456158f0d925725
+refs/heads/master: 2084fd19f8dbe5c47f36364e725c58eca910dcc4
diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -1035,22 +1035,22 @@ static int pci9111_ai_insn_read(struct comedi_device *dev,
 	return i;
 }
 
-/*  Analog instant output */
-
-static int
-pci9111_ao_insn_write(struct comedi_device *dev,
-		      struct comedi_subdevice *s, struct comedi_insn *insn,
-		      unsigned int *data)
+static int pci9111_ao_insn_write(struct comedi_device *dev,
+				 struct comedi_subdevice *s,
+				 struct comedi_insn *insn,
+				 unsigned int *data)
 {
 	struct pci9111_private_data *dev_private = dev->private;
+	unsigned int val = 0;
 	int i;
 
 	for (i = 0; i < insn->n; i++) {
-		outw(data[i], dev->iobase + PCI9111_AO_REG);
-		dev_private->ao_readback = data[i];
+		val = data[i];
+		outw(val, dev->iobase + PCI9111_AO_REG);
 	}
+	dev_private->ao_readback = val;
 
-	return i;
+	return insn->n;
 }
 
 static int pci9111_ao_insn_read(struct comedi_device *dev,