A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 07:03:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: camera: isp: Fix failure due to dereference of invalid ife device" into camera-kernel.lnx.4.0

Browse source
This commit is contained in:
Camera Software Integration 2020-02-21 13:39:51 -08:00 • committed by Gerrit - the friendly Code Review server
commit 1a40a879c3
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
View file

@ -3948,7 +3948,8 @@ static int cam_ife_mgr_reset_vfe_hw(struct cam_ife_hw_mgr *hw_mgr,
vfe_reset_type = CAM_VFE_HW_RESET_HW;
for (i = 0; i < CAM_VFE_HW_NUM_MAX; i++) {
if (hw_idx != hw_mgr->ife_devices[i]->hw_idx)
if ((!hw_mgr->ife_devices[i]) ||
(hw_idx != hw_mgr->ife_devices[i]->hw_idx))
continue;
CAM_DBG(CAM_ISP, "VFE (id = %d) reset", hw_idx);
vfe_hw_intf = hw_mgr->ife_devices[i];

2
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_dev.c
View file

@ -14,7 +14,7 @@
#include "cam_vfe_soc.h"
#include "cam_debug_util.h"
static struct cam_hw_intf *cam_vfe_hw_list[CAM_VFE_HW_NUM_MAX] = {0, 0, 0, 0};
static struct cam_hw_intf *cam_vfe_hw_list[CAM_VFE_HW_NUM_MAX];
static char vfe_dev_name[8];