samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: camera: isp: Fixing KW errors" into camera-kernel.lnx.5.0

Browse Source
This commit is contained in:
Haritha Chintalapati
2021-02-26 15:51:45 -08:00
committed by Gerrit - the friendly Code Review server
parent 3198ac75e2 a12577028b
commit 025842520f
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/cam_cust/cam_custom_hw_mgr/cam_custom_csid/cam_custom_csid_dev.c
View File

@@ -115,12 +115,13 @@ static void cam_custom_csid_component_unbind(struct device *dev,
{
struct cam_hw_intf *csid_hw_intf;
struct cam_hw_info *csid_hw_info;
struct cam_ife_csid_core_info *core_info = NULL;
struct cam_ife_csid_core_info *core_info = NULL;
struct platform_device *pdev = to_platform_device(dev);
const struct of_device_id *match_dev = NULL;
csid_hw_intf = (struct cam_hw_intf *)platform_get_drvdata(pdev);
csid_hw_info = csid_hw_intf->hw_priv;
core_info = csid_hw_info->core_info;
CAM_DBG(CAM_CUSTOM, "CSID:%d component unbind",
csid_hw_intf->hw_idx);

4
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_dev.c
View File

@@ -102,12 +102,14 @@ static void cam_ife_csid_component_unbind(struct device *dev,
{
struct cam_hw_intf *hw_intf;
struct cam_hw_info *hw_info;
struct cam_ife_csid_core_info *core_info = NULL;
struct cam_ife_csid_core_info *core_info = NULL;
struct platform_device *pdev = to_platform_device(dev);
const struct of_device_id *match_dev = NULL;
hw_intf = (struct cam_hw_intf *)platform_get_drvdata(pdev);
hw_info = hw_intf->hw_priv;
core_info = hw_info->core_info;
CAM_DBG(CAM_ISP, "CSID:%d component unbind",
hw_intf->hw_idx);
match_dev = of_match_device(pdev->dev.driver->of_match_table,

2
drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/sfe_bus/cam_sfe_bus_rd.c
View File

@@ -890,7 +890,7 @@ static int cam_sfe_bus_release_bus_rd(void *bus_priv, void *release_args,
static int cam_sfe_bus_start_bus_rd(
void *hw_priv, void *stop_hw_args, uint32_t arg_size)
{
int rc, i;
int rc = -1, i;
const uint32_t buf_done_shift = 2;
uint32_t bus_rd_done_irq_mask[1] = {0};
struct cam_isp_resource_node *sfe_bus_rd = NULL;