staging: comedi: cb_pcidas: fix dac08_write_insn()
authorH Hartley Sweeten <hartleys@visionengravers.com>
Wed, 27 Jun 2012 16:17:17 +0000 (09:17 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Jul 2012 22:28:43 +0000 (15:28 -0700)
As pointed out by Ian Abbott, the comedi INSN_WRITE instructions
are meant to iterate over, and write, all the data[] passed from
the comedi core. Modify dac08_write_insn() to work as intended.

Since doc08_write_insn() now returns the proper response to the
core, make the dac08_write() helper return void.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reported-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/cb_pcidas.c

index 3ba75afe4e05833827646334bd53497e4c36e348..301444e09433b382cd276d3b4235d736d975c6fe 100644 (file)
@@ -659,7 +659,7 @@ static int caldac_read_insn(struct comedi_device *dev,
 }
 
 /* 1602/16 pregain offset */
-static int dac08_write(struct comedi_device *dev, unsigned int value)
+static void dac08_write(struct comedi_device *dev, unsigned int value)
 {
        struct cb_pcidas_private *devpriv = dev->private;
        unsigned long cal_reg;
@@ -680,14 +680,18 @@ static int dac08_write(struct comedi_device *dev, unsigned int value)
                outw(value, cal_reg);
                udelay(1);
        }
-       return 1;       /* insn->n */
 }
 
 static int dac08_write_insn(struct comedi_device *dev,
                            struct comedi_subdevice *s,
                            struct comedi_insn *insn, unsigned int *data)
 {
-       return dac08_write(dev, data[0]);
+       int i;
+
+       for (i = 0; i < insn->n; i++)
+               dac08_write(dev, data[i]);
+
+       return insn->n;
 }
 
 static int dac08_read_insn(struct comedi_device *dev,