From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk0-f195.google.com ([209.85.220.195]:33553 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751943AbcALRe1 (ORCPT ); Tue, 12 Jan 2016 12:34:27 -0500 Received: by mail-qk0-f195.google.com with SMTP id n135so27617940qka.0 for ; Tue, 12 Jan 2016 09:34:27 -0800 (PST) From: "Spencer E. Olson" To: devel@driverdev.osuosl.org Cc: "Spencer E. Olson" , Ian Abbott , H Hartley Sweeten , Greg Kroah-Hartman , Subject: [PATCH v2] staging: comedi: ni_tiocmd: change mistaken use of start_src for start_arg Date: Tue, 12 Jan 2016 10:33:18 -0700 Message-Id: <1452619998-14586-1-git-send-email-olsonse@umich.edu> In-Reply-To: <56951A9A.8060409@mev.co.uk> References: <56951A9A.8060409@mev.co.uk> Sender: stable-owner@vger.kernel.org List-ID: 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") Cc: # 3.17+ Signed-off-by: Spencer E. Olson --- Added description suggested by Ian and Dan. Added Fixes:, CC: tags as suggested by Ian. 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 437f723..823e479 100644 --- 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 comedi_device *dev, 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); -- 1.9.1