staging: comedi: me_daq: fix me_dio_insn_config()

Currently this function does not work like the comedi code expects.

Fix the function so that it checks the instruction, data[0], and
does the correct action based on it.

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/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
index ceb5b82762e9d801ae53a049f4c5b0c766888b67..450bee0b3a3a7d3c382f94e2f5787db07f176184 100644 (file)
--- a/drivers/staging/comedi/drivers/me_daq.c
+++ b/drivers/staging/comedi/drivers/me_daq.c
@@ -188,48 +188,45 @@ static inline void sleep(unsigned sec)
        schedule_timeout(sec * HZ);
 }
 
-/*
- * ------------------------------------------------------------------
- *
- * DIGITAL INPUT/OUTPUT SECTION
- *
- * ------------------------------------------------------------------
- */
 static int me_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 me_private_data *dev_private = dev->private;
-       int bits;
-       int mask = 1 << CR_CHAN(insn->chanspec);
+       unsigned int mask = 1 << CR_CHAN(insn->chanspec);
+       unsigned int bits;
+       unsigned int port;
 
-       /* calculate port */
-       if (mask & 0x0000ffff) {        /* Port A in use */
+       if (mask & 0x0000ffff) {
                bits = 0x0000ffff;
-
-               /* Enable Port A */
-               dev_private->control_2 |= ENABLE_PORT_A;
-               writew(dev_private->control_2,
-                      dev_private->me_regbase + ME_CONTROL_2);
-       } else {                /* Port B in use */
-
+               port = ENABLE_PORT_A;
+       } else {
                bits = 0xffff0000;
-
-               /* Enable Port B */
-               dev_private->control_2 |= ENABLE_PORT_B;
-               writew(dev_private->control_2,
-                      dev_private->me_regbase + ME_CONTROL_2);
+               port = ENABLE_PORT_B;
        }
 
-       if (data[0]) {
-               /* Config port as output */
-               s->io_bits |= bits;
-       } else {
-               /* Config port as input */
+       switch (data[0]) {
+       case INSN_CONFIG_DIO_INPUT:
                s->io_bits &= ~bits;
+               dev_private->control_2 &= ~port;
+               break;
+       case INSN_CONFIG_DIO_OUTPUT:
+               s->io_bits |= bits;
+               dev_private->control_2 |= port;
+               break;
+       case INSN_CONFIG_DIO_QUERY:
+               data[1] = (s->io_bits & bits) ? COMEDI_OUTPUT : COMEDI_INPUT;
+               return insn->n;
+               break;
+       default:
+               return -EINVAL;
        }
 
-       return 1;
+       /* Update the port configuration */
+       writew(dev_private->control_2, dev_private->me_regbase + ME_CONTROL_2);
+
+       return insn->n;
 }
 
 /* Digital instant input/outputs */