From 1b096e992d783f92f151238afd9c8a4bf6b80ca5 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Thu, 25 Oct 2012 15:09:47 -0700
Subject: [PATCH] --- yaml --- r: 337327 b: refs/heads/master c:
 14d09f79d7b792d20131bc2f25a3d8a8e7cd593f h: refs/heads/master i:   337325:
 7549e0e64eab7ec3398305bf0cc5325123531692   337323:
 5cd4c1da02e94a1b02e4463ab4de46d688011e42   337319:
 22ad2003c1f96d6b838ce124b7b87a2eeb362785   337311:
 50997025ec058b0c3b619e38a132fd525c4873aa v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/staging/comedi/drivers/me_daq.c | 22 +++++--------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 54ee4342b3b9..0c40cc046b5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91b0da570722faf2e6a06f999e789405161943b5
+refs/heads/master: 14d09f79d7b792d20131bc2f25a3d8a8e7cd593f
diff --git a/trunk/drivers/staging/comedi/drivers/me_daq.c b/trunk/drivers/staging/comedi/drivers/me_daq.c
index 1efad5967d94..9f65a8ee78a4 100644
--- a/trunk/drivers/staging/comedi/drivers/me_daq.c
+++ b/trunk/drivers/staging/comedi/drivers/me_daq.c
@@ -409,22 +409,14 @@ static int me_ai_do_cmd(struct comedi_device *dev,
 	return 0;
 }
 
-/*
- * ------------------------------------------------------------------
- *
- * ANALOG OUTPUT SECTION
- *
- * ------------------------------------------------------------------
- */
-
-/* Analog instant output */
 static int me_ao_insn_write(struct comedi_device *dev,
 			    struct comedi_subdevice *s,
-			    struct comedi_insn *insn, unsigned int *data)
+			    struct comedi_insn *insn,
+			    unsigned int *data)
 {
 	struct me_private_data *dev_private = dev->private;
-	int chan;
-	int rang;
+	unsigned int chan = CR_CHAN(insn->chanspec);
+	unsigned int rang = CR_RANGE(insn->chanspec);
 	int i;
 
 	/* Enable all DAC */
@@ -437,9 +429,6 @@ static int me_ao_insn_write(struct comedi_device *dev,
 
 	/* Set dac-control register */
 	for (i = 0; i < insn->n; i++) {
-		chan = CR_CHAN((&insn->chanspec)[i]);
-		rang = CR_RANGE((&insn->chanspec)[i]);
-
 		/* clear bits for this channel */
 		dev_private->dac_control &= ~(0x0880 >> chan);
 		if (rang == 0)
@@ -457,7 +446,6 @@ static int me_ao_insn_write(struct comedi_device *dev,
 
 	/* Set data register */
 	for (i = 0; i < insn->n; i++) {
-		chan = CR_CHAN((&insn->chanspec)[i]);
 		writew((data[0] & s->maxdata),
 		       dev_private->me_regbase + ME_DAC_DATA_A + (chan << 1));
 		dev_private->ao_readback[chan] = (data[0] & s->maxdata);
@@ -466,7 +454,7 @@ static int me_ao_insn_write(struct comedi_device *dev,
 	/* Update dac with data registers */
 	readw(dev_private->me_regbase + ME_DAC_UPDATE);
 
-	return i;
+	return insn->n;
 }
 
 static int me_ao_insn_read(struct comedi_device *dev,