releases/3.14.79/staging-comedi-ni_mio_common-fix-wrong-insn_write-handler.patch

   1 From abbotti@mev.co.uk  Fri Sep  9 16:17:25 2016
   2 From: Ian Abbott <abbotti@mev.co.uk>
   3 Date: Wed,  7 Sep 2016 15:33:12 +0100
   4 Subject: staging: comedi: ni_mio_common: fix wrong insn_write handler
   5 To: stable@vger.kernel.org
   6 Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Ben Hutchings <ben@decadent.org.uk>, Ian Abbott <abbotti@mev.co.uk>
   7 Message-ID: <20160907143312.19224-1-abbotti@mev.co.uk>
   8
   9 From: Ian Abbott <abbotti@mev.co.uk>
  10
  11 commit 5ca05345c56cb979e1a25ab6146437002f95cac8 upstream.
  12
  13 For counter subdevices, the `s->insn_write` handler is being set to the
  14 wrong function, `ni_tio_insn_read()`.  It should be
  15 `ni_tio_insn_write()`.
  16
  17 Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
  18 Reported-by: Éric Piel <piel@delmic.com>
  19 Fixes: 10f74377eec3 ("staging: comedi: ni_tio: make ni_tio_winsn() a proper comedi (*insn_write)")
  20 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  21
  22 ---
  23  drivers/staging/comedi/drivers/ni_mio_common.c |    2 +-
  24  1 file changed, 1 insertion(+), 1 deletion(-)
  25
  26 --- a/drivers/staging/comedi/drivers/ni_mio_common.c
  27 +++ b/drivers/staging/comedi/drivers/ni_mio_common.c
  28 @@ -4404,7 +4404,7 @@ static int ni_E_init(struct comedi_devic
  29                 else
  30                         s->maxdata = 0xffffff;
  31                 s->insn_read = ni_tio_insn_read;
  32 -               s->insn_write = ni_tio_insn_read;
  33 +               s->insn_write = ni_tio_insn_write;
  34                 s->insn_config = ni_tio_insn_config;
  35  #ifdef PCIDMA
  36                 s->subdev_flags |= SDF_CMD_READ /* | SDF_CMD_WRITE */;