evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: ni_mio_common: fix wrong insn_write handler

Browse source 
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: 10f74377ee ("staging: comedi: ni_tio: make ni_tio_winsn() a
  proper comedi (*insn_write)"
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2016-07-20 17:07:34 +01:00 • committed by Greg Kroah-Hartman
parent b03ee3d047
commit fbde41faa1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/comedi/drivers/ni_mio_common.c
View file

@ -5354,7 +5354,7 @@ static int ni_E_init(struct comedi_device *dev,
s->maxdata = (devpriv->is_m_series) ? 0xffffffff s->maxdata = (devpriv->is_m_series) ? 0xffffffff
: 0x00ffffff; : 0x00ffffff;
s->insn_read = ni_tio_insn_read; 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; s->insn_config = ni_tio_insn_config;
#ifdef PCIDMA #ifdef PCIDMA
if (dev->irq && devpriv->mite) { if (dev->irq && devpriv->mite) {