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-12 07:37:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: camera: isp: Set device enable flag after enable csid hardware" into camera-kernel.lnx.1.0

Browse source
This commit is contained in:
Camera Software Integration 2019-11-15 05:44:35 -08:00 • committed by Gerrit - the friendly Code Review server
commit d85e275feb
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c
View file

@ -1195,6 +1195,7 @@ static int cam_ife_csid_enable_hw(struct cam_ife_csid_hw *csid_hw)
struct cam_hw_soc_info *soc_info;
uint32_t i, val;
int clk_lvl;
unsigned long flags;
csid_reg = csid_hw->csid_info->csid_reg;
soc_info = &csid_hw->hw_info->soc_info;
@ -1275,6 +1276,10 @@ static int cam_ife_csid_enable_hw(struct cam_ife_csid_hw *csid_hw)
CAM_DBG(CAM_ISP, "CSID:%d CSID HW version: 0x%x",
csid_hw->hw_intf->hw_idx, val);
spin_lock_irqsave(&csid_hw->lock_state, flags);
csid_hw->device_enabled = 1;
spin_unlock_irqrestore(&csid_hw->lock_state, flags);
return 0;
disable_soc:
@ -3273,7 +3278,6 @@ int cam_ife_csid_init_hw(void *hw_priv,
struct cam_hw_info *csid_hw_info;
struct cam_isp_resource_node *res;
const struct cam_ife_csid_reg_offset *csid_reg;
unsigned long flags;
if (!hw_priv || !init_args ||
(arg_size != sizeof(struct cam_isp_resource_node))) {
@ -3354,9 +3358,6 @@ int cam_ife_csid_init_hw(void *hw_priv,
if (rc)
cam_ife_csid_disable_hw(csid_hw);
spin_lock_irqsave(&csid_hw->lock_state, flags);
csid_hw->device_enabled = 1;
spin_unlock_irqrestore(&csid_hw->lock_state, flags);
end:
mutex_unlock(&csid_hw->hw_info->hw_mutex);
return rc;