UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: ni_at_a2150: 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.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

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>
This commit is contained in:
H Hartley Sweeten 2014-05-27 10:12:51 -07:00 committed by Greg Kroah-Hartman
parent 9f57921507
commit 75cff543a5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/comedi/drivers/ni_at_a2150.c
View File

@ -334,7 +334,7 @@ static int a2150_ai_cmdtest(struct comedi_device *dev,
{ {
const struct a2150_board *thisboard = comedi_board(dev); const struct a2150_board *thisboard = comedi_board(dev);
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 */
@ -379,10 +379,9 @@ static int a2150_ai_cmdtest(struct comedi_device *dev,
/* step 4: fix up any arguments */ /* step 4: fix up any arguments */
if (cmd->scan_begin_src == TRIG_TIMER) { if (cmd->scan_begin_src == TRIG_TIMER) {
tmp = cmd->scan_begin_arg; arg = cmd->scan_begin_arg;
a2150_get_timing(dev, &cmd->scan_begin_arg, cmd->flags); a2150_get_timing(dev, &arg, cmd->flags);
if (tmp != cmd->scan_begin_arg) err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, arg);
err++;
} }
if (err) if (err)