Merge "msm: camera: cpp: Issue CPP HALT on page fault"

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / media / platform / msm / camera_v2 / common / cam_smmu_api.c

diff --git a/drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c b/drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c
index 7d42452..4d9dc06 100644 (file)
--- a/drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c
+++ b/drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c
@@ -891,6 +891,13 @@ static int cam_smmu_detach_device(int idx)
 {
        struct cam_context_bank_info *cb = &iommu_cb_set.cb_info[idx];
 
+       if (!list_empty_careful(&iommu_cb_set.cb_info[idx].smmu_buf_list)) {
+               pr_err("Client %s buffer list is not clean!\n",
+                       iommu_cb_set.cb_info[idx].name);
+               cam_smmu_print_list(idx);
+               cam_smmu_clean_buffer_list(idx);
+       }
+
        /* detach the mapping to device */
        arm_iommu_detach_device(cb->dev);
        iommu_cb_set.cb_info[idx].state = CAM_SMMU_DETACH;