OSDN Git Service

staging: comedi: vmk80xx: GPCT_RESET is not an (*insn_config) instruction
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Thu, 22 Jan 2015 00:22:13 +0000 (17:22 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 25 Jan 2015 11:59:13 +0000 (19:59 +0800)
The data[0] parameter to (*insn_config) functions is the "configuration instruction"
that should be handled. These are defined by the enum configuration_ids in comedi.h.

This driver is currently checking the data[0] value to be INSN_CONFIG_RESET or
GPCT_RESET in order to reset a counter channel. GPCT_RESET is defined as 0x0001
which would match the configuration instruction INSN_CONFIG_DIO_OUTPUT. That doesn't
make any sense for a counter.

Remove GPCT_RESET from the insn_cmd test.

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

index 5312e0f..d200ad5 100644 (file)
@@ -558,7 +558,7 @@ static int vmk80xx_cnt_insn_config(struct comedi_device *dev,
        int n;
 
        insn_cmd = data[0];
-       if (insn_cmd != INSN_CONFIG_RESET && insn_cmd != GPCT_RESET)
+       if (insn_cmd != INSN_CONFIG_RESET)
                return -EINVAL;
 
        down(&devpriv->limit_sem);