lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB: pvrusb2: remove unneeded NULL checks

Browse Source 
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:
Dan Carpenter
2010-08-19 06:50:04 -03:00
committed by Mauro Carvalho Chehab
parent a8e0712450
commit d5337966ce
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/video/pvrusb2/pvrusb2-ctrl.c
View File

@@ -513,7 +513,7 @@ int pvr2_ctrl_sym_to_value(struct pvr2_ctrl *cptr,
if (ret >= 0) { if (ret >= 0) {
ret = pvr2_ctrl_range_check(cptr,*valptr); ret = pvr2_ctrl_range_check(cptr,*valptr);
} }
if (maskptr) *maskptr = ~0; *maskptr = ~0;
} else if (cptr->info->type == pvr2_ctl_bool) { } else if (cptr->info->type == pvr2_ctl_bool) {
ret = parse_token(ptr,len,valptr,boolNames, ret = parse_token(ptr,len,valptr,boolNames,
ARRAY_SIZE(boolNames)); ARRAY_SIZE(boolNames));
@@ -522,7 +522,7 @@ int pvr2_ctrl_sym_to_value(struct pvr2_ctrl *cptr,
} else if (ret == 0) { } else if (ret == 0) {
*valptr = (*valptr & 1) ? !0 : 0; *valptr = (*valptr & 1) ? !0 : 0;
} }
if (maskptr) *maskptr = 1; *maskptr = 1;
} else if (cptr->info->type == pvr2_ctl_enum) { } else if (cptr->info->type == pvr2_ctl_enum) {
ret = parse_token( ret = parse_token(
ptr,len,valptr, ptr,len,valptr,
@@ -531,7 +531,7 @@ int pvr2_ctrl_sym_to_value(struct pvr2_ctrl *cptr,
if (ret >= 0) { if (ret >= 0) {
ret = pvr2_ctrl_range_check(cptr,*valptr); ret = pvr2_ctrl_range_check(cptr,*valptr);
} }
if (maskptr) *maskptr = ~0; *maskptr = ~0;
} else if (cptr->info->type == pvr2_ctl_bitmask) { } else if (cptr->info->type == pvr2_ctl_bitmask) {
ret = parse_tlist( ret = parse_tlist(
ptr,len,maskptr,valptr, ptr,len,maskptr,valptr,