mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-22 01:10:28 +00:00
V4L/DVB: pvrusb2: remove unneeded NULL checks
We dereference "maskptr" unconditionally at the start of the function and also inside the call to parse_tlist() towards the end of the function. This function is called from store_val_any() and it always passes a non-NULL pointer. Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
a8e0712450
commit
d5337966ce
@ -513,7 +513,7 @@ int pvr2_ctrl_sym_to_value(struct pvr2_ctrl *cptr,
|
||||
if (ret >= 0) {
|
||||
ret = pvr2_ctrl_range_check(cptr,*valptr);
|
||||
}
|
||||
if (maskptr) *maskptr = ~0;
|
||||
*maskptr = ~0;
|
||||
} else if (cptr->info->type == pvr2_ctl_bool) {
|
||||
ret = parse_token(ptr,len,valptr,boolNames,
|
||||
ARRAY_SIZE(boolNames));
|
||||
@ -522,7 +522,7 @@ int pvr2_ctrl_sym_to_value(struct pvr2_ctrl *cptr,
|
||||
} else if (ret == 0) {
|
||||
*valptr = (*valptr & 1) ? !0 : 0;
|
||||
}
|
||||
if (maskptr) *maskptr = 1;
|
||||
*maskptr = 1;
|
||||
} else if (cptr->info->type == pvr2_ctl_enum) {
|
||||
ret = parse_token(
|
||||
ptr,len,valptr,
|
||||
@ -531,7 +531,7 @@ int pvr2_ctrl_sym_to_value(struct pvr2_ctrl *cptr,
|
||||
if (ret >= 0) {
|
||||
ret = pvr2_ctrl_range_check(cptr,*valptr);
|
||||
}
|
||||
if (maskptr) *maskptr = ~0;
|
||||
*maskptr = ~0;
|
||||
} else if (cptr->info->type == pvr2_ctl_bitmask) {
|
||||
ret = parse_tlist(
|
||||
ptr,len,maskptr,valptr,
|
||||
|
Loading…
Reference in New Issue
Block a user