summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Abbott <abbotti@mev.co.uk>2016-09-07 15:33:12 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-11 09:59:58 +0200
commitf842188c4f4f63a5b6fb59f45ac121162c0ab4c4 (patch)
treefca89fdecafcbba324f928cba399b72f3fd8b9f6
parent553a1f6d027a8e0c59ca7bbe0f26a25d1881cfef (diff)
downloadlinux-stable-f842188c4f4f63a5b6fb59f45ac121162c0ab4c4.tar.gz
linux-stable-f842188c4f4f63a5b6fb59f45ac121162c0ab4c4.tar.bz2
linux-stable-f842188c4f4f63a5b6fb59f45ac121162c0ab4c4.zip
staging: comedi: ni_mio_common: fix wrong insn_write handler
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/ni_mio_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index 457b88481db0..3312ae622284 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -4404,7 +4404,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 */;