Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030350AbcDLSJ0 (ORCPT ); Tue, 12 Apr 2016 14:09:26 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:49126 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966360AbcDLSIZ (ORCPT ); Tue, 12 Apr 2016 14:08:25 -0400 From: Luis Henriques To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: "Spencer E. Olson" , Greg Kroah-Hartman , Ian Abbott , Luis Henriques Subject: [PATCH 3.16.y-ckt 15/17] staging: comedi: ni_tiocmd: change mistaken use of start_src for start_arg Date: Tue, 12 Apr 2016 19:08:02 +0100 Message-Id: <1460484484-22395-16-git-send-email-luis.henriques@canonical.com> In-Reply-To: <1460484484-22395-1-git-send-email-luis.henriques@canonical.com> References: <1460484484-22395-1-git-send-email-luis.henriques@canonical.com> X-Extended-Stable: 3.16 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1327 Lines: 34 3.16.7-ckt27 -stable review patch. If anyone has any objections, please let me know. ---8<------------------------------------------------------------ From: "Spencer E. Olson" 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman Cc: Ian Abbott Signed-off-by: Luis Henriques --- drivers/staging/comedi/drivers/ni_tiocmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/comedi/drivers/ni_tiocmd.c b/drivers/staging/comedi/drivers/ni_tiocmd.c index 2557ab48cb6c..db4dc1410342 100644 --- a/drivers/staging/comedi/drivers/ni_tiocmd.c +++ b/drivers/staging/comedi/drivers/ni_tiocmd.c @@ -98,7 +98,7 @@ static int ni_tio_input_inttrig(struct comedi_device *dev, BUG_ON(counter == NULL); - if (trig_num != cmd->start_src) + if (trig_num != cmd->start_arg) return -EINVAL; spin_lock_irqsave(&counter->lock, flags);