evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: camera: isp: Add null check for vfe_dev."

Browse source
This commit is contained in:
Linux Build Service Account 2018-07-12 05:37:33 -07:00 • committed by Gerrit - the friendly Code Review server
commit c236da24a2
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
View file

@ -528,6 +528,12 @@ static void msm_isp_cfg_framedrop_reg(
enum msm_vfe_input_src frame_src = SRC_TO_INTF(stream_info->stream_src); enum msm_vfe_input_src frame_src = SRC_TO_INTF(stream_info->stream_src);
int i; int i;
if (vfe_dev == NULL) {
pr_err("%s %d returning vfe_dev is NULL\n",
__func__, __LINE__);
return;
}
if (vfe_dev->axi_data.src_info[frame_src].frame_id >= if (vfe_dev->axi_data.src_info[frame_src].frame_id >=
stream_info->init_frame_drop) stream_info->init_frame_drop)
runtime_init_frame_drop = 0; runtime_init_frame_drop = 0;