diff options
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r-- | drivers/staging/comedi/drivers/me4000.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c index c85e5e5420b..a489a6548e7 100644 --- a/drivers/staging/comedi/drivers/me4000.c +++ b/drivers/staging/comedi/drivers/me4000.c | |||
@@ -969,28 +969,23 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev, | |||
969 | if (err) | 969 | if (err) |
970 | return 2; | 970 | return 2; |
971 | 971 | ||
972 | /* | 972 | /* Step 3: check if arguments are trivially valid */ |
973 | * Stage 3. Check if arguments are generally valid. | 973 | |
974 | */ | ||
975 | if (cmd->chanlist_len < 1) { | 974 | if (cmd->chanlist_len < 1) { |
976 | dev_err(dev->class_dev, "No channel list\n"); | ||
977 | cmd->chanlist_len = 1; | 975 | cmd->chanlist_len = 1; |
978 | err++; | 976 | err |= -EINVAL; |
979 | } | 977 | } |
980 | if (init_ticks < 66) { | 978 | if (init_ticks < 66) { |
981 | dev_err(dev->class_dev, "Start arg to low\n"); | ||
982 | cmd->start_arg = 2000; | 979 | cmd->start_arg = 2000; |
983 | err++; | 980 | err |= -EINVAL; |
984 | } | 981 | } |
985 | if (scan_ticks && scan_ticks < 67) { | 982 | if (scan_ticks && scan_ticks < 67) { |
986 | dev_err(dev->class_dev, "Scan begin arg to low\n"); | ||
987 | cmd->scan_begin_arg = 2031; | 983 | cmd->scan_begin_arg = 2031; |
988 | err++; | 984 | err |= -EINVAL; |
989 | } | 985 | } |
990 | if (chan_ticks < 66) { | 986 | if (chan_ticks < 66) { |
991 | dev_err(dev->class_dev, "Convert arg to low\n"); | ||
992 | cmd->convert_arg = 2000; | 987 | cmd->convert_arg = 2000; |
993 | err++; | 988 | err |= -EINVAL; |
994 | } | 989 | } |
995 | 990 | ||
996 | if (err) | 991 | if (err) |