lkml.org 
[lkml]   [2016]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 092/210] staging: comedi: ni_tiocmd: change mistaken use of start_src for start_arg
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Spencer E. Olson <olsonse@umich.edu>

    commit 1fd24a4702d2af0ea4d5845126cf57d4d1796216 upstream.

    This fixes a bug in function ni_tio_input_inttrig(). The trigger number
    should be compared to cmd->start_arg, not cmd->start_src.

    Fixes: 6a760394d7eb ("staging: comedi: ni_tiocmd: clarify the cmd->start_arg validation and use")
    Signed-off-by: Spencer E. Olson <olsonse@umich.edu>
    Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/staging/comedi/drivers/ni_tiocmd.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/staging/comedi/drivers/ni_tiocmd.c
    +++ b/drivers/staging/comedi/drivers/ni_tiocmd.c
    @@ -92,7 +92,7 @@ static int ni_tio_input_inttrig(struct c
    unsigned long flags;
    int ret = 0;

    - if (trig_num != cmd->start_src)
    + if (trig_num != cmd->start_arg)
    return -EINVAL;

    spin_lock_irqsave(&counter->lock, flags);

    \
     
     \ /
      Last update: 2016-04-10 22:21    [W:5.243 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site