From b3aa1cd08a5b31af166c5585f184a5990730b163 Mon Sep 17 00:00:00 2001 From: Shubhraprakash Das Date: Mon, 12 Dec 2016 14:48:31 -0800 Subject: [PATCH] msm: camera: isp: Do not halt vfe from tasklet The h/w cannot be halted in tasklet context since halting requires the tasklet to be flushed. Masking interrupts is enough when error is detected in tasklet. CRs-Fixed: 1100416 Change-Id: Ie9aaec222e72c40d640564a4c6bc5728e3d5aa9c Signed-off-by: Shubhraprakash Das --- drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c index 0db901de4562..af82b84f613f 100644 --- a/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c +++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c @@ -1680,11 +1680,6 @@ void msm_isp_halt_send_error(struct vfe_device *vfe_dev, uint32_t event) temp_dev->hw_info->vfe_ops.core_ops. set_halt_restart_mask(temp_dev); } - /* heavy spin lock in axi halt, avoid spin lock outside. */ - msm_isp_axi_halt(vfe_dev, &halt_cmd); - if (temp_dev) - msm_isp_axi_halt(temp_dev, &halt_cmd); - error_event.frame_id = vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id;