diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-05-27 10:12:46 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-28 14:25:56 -0700 |
| commit | e9ace43cbff7894f63a4f5a9d8c0f7d20545add4 (patch) | |
| tree | 5c1ad045ea120cb61f7491ee38f299883393754a /drivers | |
| parent | 0e21721125e6fe9677ed9c2eb07057ae6e466fcf (diff) | |
| download | linux-e9ace43cbff7894f63a4f5a9d8c0f7d20545add4.tar.bz2 | |
staging: comedi: das16m1: use comedi_fc helpers to validate timer args
Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger arguments when the source is TRIG_TIMER.
For aesthetics, rename the local variable 'tmp' to 'arg'.
Also, change the 'err' variable to the correct type.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/das16m1.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/das16m1.c b/drivers/staging/comedi/drivers/das16m1.c index c97444991d89..ec039fbff0f9 100644 --- a/drivers/staging/comedi/drivers/das16m1.c +++ b/drivers/staging/comedi/drivers/das16m1.c @@ -182,7 +182,8 @@ static int das16m1_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_cmd *cmd) { struct das16m1_private_struct *devpriv = dev->private; - unsigned int err = 0, tmp; + int err = 0; + unsigned int arg; /* Step 1 : check if triggers are trivially valid */ @@ -231,14 +232,12 @@ static int das16m1_cmd_test(struct comedi_device *dev, /* step 4: fix up arguments */ if (cmd->convert_src == TRIG_TIMER) { - tmp = cmd->convert_arg; - /* calculate counter values that give desired timing */ + arg = cmd->convert_arg; i8253_cascade_ns_to_timer(I8254_OSC_BASE_10MHZ, &devpriv->divisor1, &devpriv->divisor2, - &cmd->convert_arg, cmd->flags); - if (tmp != cmd->convert_arg) - err++; + &arg, cmd->flags); + err |= cfc_check_trigger_arg_is(&cmd->convert_arg, arg); } if (err) |