浏览代码

Merge "msm: camera: ife: Always send stop immediately when stopping hw" into camera-kernel.lnx.4.0

Camera Software Integration 4 年之前
父节点
当前提交
8fb208f634
共有 1 个文件被更改,包括 2 次插入6 次删除
  1. 2 6
      drivers/cam_isp/cam_isp_context.c

+ 2 - 6
drivers/cam_isp/cam_isp_context.c

@@ -5028,13 +5028,9 @@ static int __cam_isp_ctx_stop_dev_in_activated_unlock(
 	if (ctx_isp->hw_ctx) {
 		stop.ctxt_to_hw_map = ctx_isp->hw_ctx;
 
-		if (stop_cmd)
-			stop_isp.hw_stop_cmd =
-				CAM_ISP_HW_STOP_AT_FRAME_BOUNDARY;
-		else
-			stop_isp.hw_stop_cmd = CAM_ISP_HW_STOP_IMMEDIATELY;
-
+		stop_isp.hw_stop_cmd = CAM_ISP_HW_STOP_IMMEDIATELY;
 		stop_isp.stop_only = false;
+
 		stop.args = (void *) &stop_isp;
 		ctx->hw_mgr_intf->hw_stop(ctx->hw_mgr_intf->hw_mgr_priv,
 			&stop);