From 13bec8b88ea7065788bf24f1aa29dc94aa784e14 Mon Sep 17 00:00:00 2001 From: Jigarkumar Zala Date: Mon, 29 Jul 2019 11:58:49 -0700 Subject: [PATCH] Revert "msm: camera: ife: Stop tasklet after deinit" This reverts commit ff736fcb813649b3998fca3d732145f341235cf5. The above change was committed to prevent tasklet deinit before ISRs have completed execution due to erratic delays in tasklet scheduling on early builds which was not stable. As builds have stabilized now, we need to revert to normal driver behavior for stop sequence. Change-Id: I57127d3fe6fbbd5579241c1cfc978362ba302aef Signed-off-by: Venkat Chinta Signed-off-by: Jigarkumar Zala --- drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c b/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c index 75f157f0d5b8..473a274eaf5c 100644 --- a/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c +++ b/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c @@ -3334,19 +3334,17 @@ static int cam_ife_mgr_stop_hw(void *hw_mgr_priv, void *stop_hw_args) cam_ife_hw_mgr_stop_hw_res(hw_mgr_res); } + cam_tasklet_stop(ctx->common.tasklet_info); + cam_ife_mgr_pause_hw(ctx); - if (stop_isp->stop_only) { - cam_tasklet_stop(ctx->common.tasklet_info); + if (stop_isp->stop_only) goto end; - } if (cam_cdm_stream_off(ctx->cdm_handle)) CAM_ERR(CAM_ISP, "CDM stream off failed %d", ctx->cdm_handle); cam_ife_hw_mgr_deinit_hw(ctx); - cam_tasklet_stop(ctx->common.tasklet_info); - CAM_DBG(CAM_ISP, "Stop success for ctx id:%d rc :%d", ctx->ctx_index, rc);