[PATCH 2/4] staging: comedi: dt282x: fix dt282x_dio_insn_config()

[H Hartley Sweeten]

This is the (*insn_config) function for a DIO subdevice. It should be
using the data[0] value as the "instruction" to perform on the subdevice.

Use the comedi_dio_insn_config() helper to properly handle instructions.

Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/staging/comedi/drivers/dt282x.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/comedi/drivers/dt282x.c 
b/drivers/staging/comedi/drivers/dt282x.c
index 4a25382..da3ee85 100644
--- a/drivers/staging/comedi/drivers/dt282x.c
+++ b/drivers/staging/comedi/drivers/dt282x.c
@@ -982,29 +982,32 @@ static int dt282x_dio_insn_bits(struct comedi_device *dev,
 
 static int dt282x_dio_insn_config(struct comedi_device *dev,
                                  struct comedi_subdevice *s,
-                                 struct comedi_insn *insn, unsigned int *data)
+                                 struct comedi_insn *insn,
+                                 unsigned int *data)
 {
        struct dt282x_private *devpriv = dev->private;
-       int mask;
+       unsigned int chan = CR_CHAN(insn->chanspec);
+       unsigned int mask;
+       int ret;
 
-       mask = (CR_CHAN(insn->chanspec) < 8) ? 0x00ff : 0xff00;
-       if (data[0])
-               s->io_bits |= mask;
+       if (chan < 8)
+               mask = 0x00ff;
        else
-               s->io_bits &= ~mask;
+               mask = 0xff00;
+
+       ret = comedi_dio_insn_config(dev, s, insn, data, mask);
+       if (ret)
+               return ret;
 
+       devpriv->dacsr &= ~(DT2821_LBOE | DT2821_HBOE);
        if (s->io_bits & 0x00ff)
                devpriv->dacsr |= DT2821_LBOE;
-       else
-               devpriv->dacsr &= ~DT2821_LBOE;
        if (s->io_bits & 0xff00)
                devpriv->dacsr |= DT2821_HBOE;
-       else
-               devpriv->dacsr &= ~DT2821_HBOE;
 
        outw(devpriv->dacsr, dev->iobase + DT2821_DACSR);
 
-       return 1;
+       return insn->n;
 }
 
 static const struct comedi_lrange *const ai_range_table[] = {
-- 
1.8.3.2

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel