lkml.org 
[lkml]   [2016]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 341/346] staging: comedi: ni_mio_common: fix wrong insn_write handler
    3.16.39-rc1 review patch.  If anyone has any objections, please let me know.

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

    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: Ben Hutchings <ben@decadent.org.uk>
    ---
    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 */;
    \
     
     \ /
      Last update: 2016-11-14 04:26    [W:4.041 / U:0.652 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site