[PATCH 3.14 to 3.16] staging: comedi: ni_mio_common: fix wrong insn_write handler

[PATCH 3.14 to 3.16] staging: comedi: ni_mio_common: fix wrong insn_write handler

[Ian Abbott]

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)")
---
 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 */;
-- 
2.9.3

Patch "staging: comedi: ni_mio_common: fix wrong insn_write handler" has been added to the 3.14-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    staging: comedi: ni_mio_common: fix wrong insn_write handler

to the 3.14-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     staging-comedi-ni_mio_common-fix-wrong-insn_write-handler.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From abbotti@mev.co.uk  Fri Sep  9 16:17:25 2016
From: Ian Abbott <abbotti@mev.co.uk>
Date: Wed,  7 Sep 2016 15:33:12 +0100
Subject: staging: comedi: ni_mio_common: fix wrong insn_write handler
To: stable@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Ben Hutchings <ben@decadent.org.uk>, Ian Abbott <abbotti@mev.co.uk>
Message-ID: <20160907143312.19224-1-abbotti@mev.co.uk>

From: Ian Abbott <abbotti@mev.co.uk>

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>

---
 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
@@ -4404,7 +4404,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 */;


Patches currently in stable-queue which might be from abbotti@mev.co.uk are

queue-3.14/staging-comedi-ni_mio_common-fix-wrong-insn_write-handler.patch

Re: [PATCH 3.14 to 3.16] staging: comedi: ni_mio_common: fix wrong insn_write handler

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 1381 bytes --]

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@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)")

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 #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]