On Wed, 2016-09-07 at 15:33 +0100, Ian Abbott wrote:
> 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@xxxxxxxxx>
> > Reported-by: Éric Piel <piel@xxxxxxxxxx>
> Fixes: 10f74377eec3 ("staging: comedi: ni_tio: make ni_tio_winsn() a
> proper comedi (*insn_write)")
I've queued this up for 3.16, thanks.
Ben.
> ---
> drivers/staging/comedi/drivers/ni_mio_common.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
> index 457b884..3312ae6 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 */;
--
Ben Hutchings
If you seem to know what you are doing, you'll be given more to do.
Attachment:
signature.asc
Description: This is a digitally signed message part