Commit e4d18fe6 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: pcl816: 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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d3ab24c8
...@@ -370,7 +370,7 @@ static int pcl816_ai_cmdtest(struct comedi_device *dev, ...@@ -370,7 +370,7 @@ static int pcl816_ai_cmdtest(struct comedi_device *dev,
{ {
struct pcl816_private *devpriv = dev->private; struct pcl816_private *devpriv = dev->private;
int err = 0; int err = 0;
int tmp; unsigned int arg;
/* Step 1 : check if triggers are trivially valid */ /* Step 1 : check if triggers are trivially valid */
...@@ -417,15 +417,12 @@ static int pcl816_ai_cmdtest(struct comedi_device *dev, ...@@ -417,15 +417,12 @@ static int pcl816_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_10MHZ, i8253_cascade_ns_to_timer(I8254_OSC_BASE_10MHZ,
&devpriv->divisor1, &devpriv->divisor1,
&devpriv->divisor2, &devpriv->divisor2,
&cmd->convert_arg, cmd->flags); &arg, cmd->flags);
if (cmd->convert_arg < 10000) err |= cfc_check_trigger_arg_is(&cmd->convert_arg, arg);
cmd->convert_arg = 10000;
if (tmp != cmd->convert_arg)
err++;
} }
if (err) if (err)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment