From bbb696d58acfaf0d8e55ea2be954493c41ee9f40 Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@mev.co.uk>
Date: Wed, 24 Oct 2012 16:48:13 +0100
Subject: [PATCH] --- yaml --- r: 337247 b: refs/heads/master c:
 fad18543cef4d6368b00fb318d0b31d1e2deabb6 h: refs/heads/master i:   337245:
 495d18de586b8a1d07caca21f2c2064f293f948e   337243:
 147673f51428ed6050c509c3232e9d4efef0d709   337239:
 bce142d9d70811e60052ac87142dc7c3230eb238   337231:
 9aa9343b60dea4acc34adee0d811eea1d495ce4d   337215:
 cf01e631548480f4389f8e2e75f5341fef08933b v: v3

---
 [refs]                                        |  2 +-
 .../staging/comedi/drivers/amplc_dio200.c     | 24 +++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 51a0c180ec84..87db73a6d50d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c59515a879d69fd8fc25c8d7eea6aa03ceb6983d
+refs/heads/master: fad18543cef4d6368b00fb318d0b31d1e2deabb6
diff --git a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
index d72a86b3e9ff..95c3f7824d81 100644
--- a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
+++ b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
@@ -1270,13 +1270,15 @@ dio200_subdev_8254_read(struct comedi_device *dev, struct comedi_subdevice *s,
 {
 	struct dio200_subdev_8254 *subpriv = s->private;
 	int chan = CR_CHAN(insn->chanspec);
+	unsigned int n;
 	unsigned long flags;
 
-	spin_lock_irqsave(&subpriv->spinlock, flags);
-	data[0] = dio200_subdev_8254_read_chan(dev, s, chan);
-	spin_unlock_irqrestore(&subpriv->spinlock, flags);
-
-	return 1;
+	for (n = 0; n < insn->n; n++) {
+		spin_lock_irqsave(&subpriv->spinlock, flags);
+		data[n] = dio200_subdev_8254_read_chan(dev, s, chan);
+		spin_unlock_irqrestore(&subpriv->spinlock, flags);
+	}
+	return insn->n;
 }
 
 /*
@@ -1288,13 +1290,15 @@ dio200_subdev_8254_write(struct comedi_device *dev, struct comedi_subdevice *s,
 {
 	struct dio200_subdev_8254 *subpriv = s->private;
 	int chan = CR_CHAN(insn->chanspec);
+	unsigned int n;
 	unsigned long flags;
 
-	spin_lock_irqsave(&subpriv->spinlock, flags);
-	dio200_subdev_8254_write_chan(dev, s, chan, data[0]);
-	spin_unlock_irqrestore(&subpriv->spinlock, flags);
-
-	return 1;
+	for (n = 0; n < insn->n; n++) {
+		spin_lock_irqsave(&subpriv->spinlock, flags);
+		dio200_subdev_8254_write_chan(dev, s, chan, data[n]);
+		spin_unlock_irqrestore(&subpriv->spinlock, flags);
+	}
+	return insn->n;
 }
 
 /*