]> git.hungrycats.org Git - linux/commitdiff
staging: comedi: ni_mio_common: fix wrong insn_write handler
authorIan Abbott <abbotti@mev.co.uk>
Wed, 7 Sep 2016 14:33:12 +0000 (15:33 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 20 Nov 2016 01:17:39 +0000 (01:17 +0000)
commit 5ca05345c56cb979e1a25ab6146437002f95cac8 upstream.

For counter subdevices, the `s->insn_write` handler is being set to the
wrong function, `ni_tio_insn_read()`.  It should be
`ni_tio_insn_write()`.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reported-by: Éric Piel <piel@delmic.com>
Fixes: 10f74377eec3 ("staging: comedi: ni_tio: make ni_tio_winsn() a
  proper comedi (*insn_write)")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/staging/comedi/drivers/ni_mio_common.c

index 28bfd609d65b5c0d502630ec3dc8eaca0eca1a8a..83a96bcb21b63bf17d7c47064d153c9cba328f6b 100644 (file)
@@ -4415,7 +4415,7 @@ static int ni_E_init(struct comedi_device *dev)
                else
                        s->maxdata = 0xffffff;
                s->insn_read = ni_tio_insn_read;
-               s->insn_write = ni_tio_insn_read;
+               s->insn_write = ni_tio_insn_write;
                s->insn_config = ni_tio_insn_config;
 #ifdef PCIDMA
                s->subdev_flags |= SDF_CMD_READ /* | SDF_CMD_WRITE */;