Subdevice 0 is a digial output not a digital I/O subdevice.
Fix the type and, for aesthetics, rename the (*insn_bits) function used
to set the outputs.
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/aio_iiro_16.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/comedi/drivers/aio_iiro_16.c
b/drivers/staging/comedi/drivers/aio_iiro_16.c
index 7b5ed43..87d1372 100644
--- a/drivers/staging/comedi/drivers/aio_iiro_16.c
+++ b/drivers/staging/comedi/drivers/aio_iiro_16.c
@@ -39,10 +39,10 @@ Configuration Options:
#define AIO_IIRO_16_RELAY_8_15 0x04
#define AIO_IIRO_16_INPUT_8_15 0x05
-static int aio_iiro_16_dio_insn_bits_write(struct comedi_device *dev,
- struct comedi_subdevice *s,
- struct comedi_insn *insn,
- unsigned int *data)
+static int aio_iiro_16_do_insn_bits(struct comedi_device *dev,
+ struct comedi_subdevice *s,
+ struct comedi_insn *insn,
+ unsigned int *data)
{
if (comedi_dio_update_state(s, data)) {
outb(s->state & 0xff, dev->iobase + AIO_IIRO_16_RELAY_0_7);
@@ -82,12 +82,12 @@ static int aio_iiro_16_attach(struct comedi_device *dev,
return ret;
s = &dev->subdevices[0];
- s->type = COMEDI_SUBD_DIO;
+ s->type = COMEDI_SUBD_DO;
s->subdev_flags = SDF_WRITABLE;
s->n_chan = 16;
s->maxdata = 1;
s->range_table = &range_digital;
- s->insn_bits = aio_iiro_16_dio_insn_bits_write;
+ s->insn_bits = aio_iiro_16_do_insn_bits;
s = &dev->subdevices[1];
s->type = COMEDI_SUBD_DIO;
--
2.0.3
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
