Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5337966 authored by Dan Carpenter's avatar Dan Carpenter Committed by Mauro Carvalho Chehab
Browse files

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: default avatarDan Carpenter <error27@gmail.com>
Acked-by: default avatarMike Isely <isely@pobox.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a8e07124

drivers/media/video/pvrusb2/pvrusb2-ctrl.c

+3 −3
Original line number Diff line number Diff line
@@ -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,