From: H Hartley Sweeten Date: Thu, 17 Apr 2014 17:07:57 +0000 (-0700) Subject: staging: comedi: cb_pcidas: fix the ao cmd->start_arg use for TRIG_INT X-Git-Tag: v3.16-rc1~30^2~36^2~1329 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=384e483fb9d487bb318acc7098f61d3feffa4d79;p=~emulex%2Finfiniband.git staging: comedi: cb_pcidas: fix the ao cmd->start_arg use for TRIG_INT This driver only supports a cmd->start_src of TRIG_INT for ai commands. The cmd->start_arg is trivially validated to be 0. For TRIG_INT source, the cmd->start_arg is actually the valid trig_num that is passed to the async (*inttrig) callback. Refactor the (*inttrig) function so that the cmd->start_arg is used to check the trig_num instead of the open coded value. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c index 523378fbf30..26fc00e552a 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas.c +++ b/drivers/staging/comedi/drivers/cb_pcidas.c @@ -1169,7 +1169,7 @@ static int cb_pcidas_ao_inttrig(struct comedi_device *dev, struct comedi_cmd *cmd = &s->async->cmd; unsigned long flags; - if (trig_num != 0) + if (trig_num != cmd->start_arg) return -EINVAL; /* load up fifo */