From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Mon, 3 Mar 2014 23:47:39 +0000 (-0700)
Subject: staging: comedi: ke_counter: fix ke_counter_insn_read()
X-Git-Tag: firefly_0821_release~176^2~4193^2~737
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d250972f93d3d73134bd8a251fed86e9e9d0dab5;p=firefly-linux-kernel-4.4.55.git

staging: comedi: ke_counter: fix ke_counter_insn_read()

The comedi core expects the (*insn_read) functions to read insn->n
values. Fix this function to work like the core expects.

The counters are actually 25-bit (24-bits + 1 sign bit). Instead of munging
the data when the sign bit is set just return the full 25-bit value.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c
index 5dfe2bb4c14c..ea30cfe0a0bf 100644
--- a/drivers/staging/comedi/drivers/ke_counter.c
+++ b/drivers/staging/comedi/drivers/ke_counter.c
@@ -76,24 +76,23 @@ static int ke_counter_insn_read(struct comedi_device *dev,
 				struct comedi_insn *insn,
 				unsigned int *data)
 {
-	unsigned char a0, a1, a2, a3, a4;
-	int chan = CR_CHAN(insn->chanspec);
-	int result;
+	unsigned int chan = CR_CHAN(insn->chanspec);
+	unsigned int val;
+	int i;
 
-	a0 = inb(dev->iobase + KE_LATCH_REG(chan));
-	a1 = inb(dev->iobase + KE_LSB_REG(chan));
-	a2 = inb(dev->iobase + KE_MID_REG(chan));
-	a3 = inb(dev->iobase + KE_MSB_REG(chan));
-	a4 = inb(dev->iobase + KE_SIGN_REG(chan));
+	for (i = 0; i < insn->n; i++) {
+		/* Order matters */
+		inb(dev->iobase + KE_LATCH_REG(chan));
 
-	result = (a1 + (a2 * 256) + (a3 * 65536));
-	if (a4 > 0)
-		result = result - s->maxdata;
+		val = inb(dev->iobase + KE_LSB_REG(chan));
+		val |= (inb(dev->iobase + KE_MID_REG(chan)) << 8);
+		val |= (inb(dev->iobase + KE_MSB_REG(chan)) << 16);
+		val |= (inb(dev->iobase + KE_SIGN_REG(chan)) << 24);
 
-	*data = (unsigned int)result;
+		data[i] = val;
+	}
 
-	/* return the number of samples read */
-	return 1;
+	return insn->n;
 }
 
 static int cnt_auto_attach(struct comedi_device *dev,