提交 d3ab24c8 编写于 作者: H H Hartley Sweeten 提交者: Greg Kroah-Hartman

staging: comedi: pcl812: use comedi_fc helpers to validate timer arg

Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger argument when the source is TRIG_TIMER.

The minimum test is not needed, this was already validated in Step 3.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.
Signed-off-by: NH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: NIan Abbott <abbotti@mev.co.uk>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 2eb2a5dd
...@@ -721,7 +721,7 @@ static int pcl812_ai_cmdtest(struct comedi_device *dev, ...@@ -721,7 +721,7 @@ static int pcl812_ai_cmdtest(struct comedi_device *dev,
struct pcl812_private *devpriv = dev->private; struct pcl812_private *devpriv = dev->private;
int err = 0; int err = 0;
unsigned int flags; unsigned int flags;
int tmp; unsigned int arg;
/* Step 1 : check if triggers are trivially valid */ /* Step 1 : check if triggers are trivially valid */
...@@ -774,15 +774,12 @@ static int pcl812_ai_cmdtest(struct comedi_device *dev, ...@@ -774,15 +774,12 @@ static int pcl812_ai_cmdtest(struct comedi_device *dev,
/* step 4: fix up any arguments */ /* step 4: fix up any arguments */
if (cmd->convert_src == TRIG_TIMER) { if (cmd->convert_src == TRIG_TIMER) {
tmp = cmd->convert_arg; arg = cmd->convert_arg;
i8253_cascade_ns_to_timer(I8254_OSC_BASE_2MHZ, i8253_cascade_ns_to_timer(I8254_OSC_BASE_2MHZ,
&devpriv->divisor1, &devpriv->divisor1,
&devpriv->divisor2, &devpriv->divisor2,
&cmd->convert_arg, cmd->flags); &arg, cmd->flags);
if (cmd->convert_arg < board->ai_ns_min) err |= cfc_check_trigger_arg_is(&cmd->convert_arg, arg);
cmd->convert_arg = board->ai_ns_min;
if (tmp != cmd->convert_arg)
err++;
} }
if (err) if (err)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册