]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
staging: comedi: ni_mio_common: fix wrong insn_write handler
authorIan Abbott <abbotti@mev.co.uk>
Wed, 20 Jul 2016 16:07:34 +0000 (17:07 +0100)
committerSasha Levin <alexander.levin@verizon.com>
Mon, 12 Sep 2016 13:44:54 +0000 (09:44 -0400)
[ Upstream commit 5ca05345c56cb979e1a25ab6146437002f95cac8 ]

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)"
Cc: <stable@vger.kernel.org> # 3.17+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
drivers/staging/comedi/drivers/ni_mio_common.c

index 34b3a522668f767080c46c13b393e8b4fd1fbccb..92abb8b32dccd551f4017a7518e77ccc12699518 100644 (file)
@@ -5635,7 +5635,7 @@ static int ni_E_init(struct comedi_device *dev,
                s->maxdata      = (devpriv->is_m_series) ? 0xffffffff
                                                         : 0x00ffffff;
                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
                if (dev->irq && devpriv->mite) {