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 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

msm: camera: cdm: Fix component unbind failures in cdm hw

Browse source 
In cdm hw unbind, smmu handle is destroyed before handler is
unset. Also, mutex unlock is unbalanced during error case. Fix
invalid unset handler call and unbalanced mutex in component
unbind for hw cdm.

CRs-Fixed: 2584631
Change-Id: I8e117ce9623ba631d9457ef851b8f271591091b6
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
This commit is contained in:
Mukund Madhusudan Atre 2020-02-16 23:29:27 -08:00
commit afb504ab34
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/cam_cdm/cam_cdm_hw_core.c
View file

@ -1894,10 +1894,10 @@ static void cam_hw_cdm_component_unbind(struct device *dev,
destroy_workqueue(cdm_core->bl_fifo[i].work_queue);
}
if (cam_smmu_destroy_handle(cdm_core->iommu_hdl.non_secure))
CAM_ERR(CAM_CDM, "Release iommu secure hdl failed");
cam_smmu_unset_client_page_fault_handler(
cdm_core->iommu_hdl.non_secure, cdm_hw);
if (cam_smmu_destroy_handle(cdm_core->iommu_hdl.non_secure))
CAM_ERR(CAM_CDM, "Release iommu secure hdl failed");
mutex_destroy(&cdm_hw->hw_mutex);
kfree(cdm_hw->soc_info.soc_private);

3
drivers/cam_cdm/cam_cdm_intf.c
View file

@ -620,7 +620,7 @@ static void cam_cdm_intf_component_unbind(struct device *dev,
if (cam_virtual_cdm_remove(pdev)) {
CAM_ERR(CAM_CDM, "Virtual CDM remove failed");
goto end;
return;
}
put_cdm_mgr_refcount();
@ -635,7 +635,6 @@ static void cam_cdm_intf_component_unbind(struct device *dev,
if (cdm_mgr.nodes[i].device || cdm_mgr.nodes[i].data ||
(cdm_mgr.nodes[i].refcount != 0)) {
CAM_ERR(CAM_CDM, "Valid node present in index=%d", i);
mutex_unlock(&cam_cdm_mgr_lock);
goto end;
}
mutex_destroy(&cdm_mgr.nodes[i].lock);