3.16.39-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Ian Abbott <[email protected]>

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 <[email protected]>
Reported-by: Éric Piel <[email protected]>
Fixes: 10f74377eec3 ("staging: comedi: ni_tio: make ni_tio_winsn() a
  proper comedi (*insn_write)")
Signed-off-by: Ben Hutchings <[email protected]>
---
 drivers/staging/comedi/drivers/ni_mio_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -4415,7 +4415,7 @@ static int ni_E_init(struct comedi_devic
                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 */;

Reply via email to