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

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

diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
index 2f8134b..f19e6dd 100644 (file)
--- a/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
+++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
@@ -2318,7 +2318,9 @@ int msm_isp_open_node(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 
        cam_smmu_reg_client_page_fault_handler(
                        vfe_dev->buf_mgr->iommu_hdl,
-                       msm_vfe_iommu_fault_handler, vfe_dev);
+                       msm_vfe_iommu_fault_handler,
+                       NULL,
+                       vfe_dev);
        mutex_unlock(&vfe_dev->core_mutex);
        mutex_unlock(&vfe_dev->realtime_mutex);
        return 0;
@@ -2367,7 +2369,7 @@ int msm_isp_close_node(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
        /* Unregister page fault handler */
        cam_smmu_reg_client_page_fault_handler(
                vfe_dev->buf_mgr->iommu_hdl,
-               NULL, vfe_dev);
+               NULL, NULL, vfe_dev);
 
        rc = vfe_dev->hw_info->vfe_ops.axi_ops.halt(vfe_dev, 1);
        if (rc <= 0)