Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa46cd18 authored by Suresh Vankadara's avatar Suresh Vankadara Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: Halt device with the command parsed" into dev/msm-4.14-camx

parents 7f6647e2 2e12f31b

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+2 −2
Original line number Diff line number Diff line
@@ -2637,7 +2637,7 @@ static int cam_ife_mgr_stop_hw(void *hw_mgr_priv, void *stop_hw_args) 


	/* Stop the master CSID path first */

	cam_ife_mgr_csid_stop_hw(ctx, &ctx->res_list_ife_csid,

		master_base_idx, CAM_CSID_HALT_AT_FRAME_BOUNDARY);

		master_base_idx, csid_halt_type);



	/* stop rest of the CSID paths  */

	for (i = 0; i < ctx->num_base; i++) {
@@ -2647,7 +2647,7 @@ static int cam_ife_mgr_stop_hw(void *hw_mgr_priv, void *stop_hw_args) 
			ctx->base[i].idx, i, master_base_idx);



		cam_ife_mgr_csid_stop_hw(ctx, &ctx->res_list_ife_csid,

			ctx->base[i].idx, CAM_CSID_HALT_AT_FRAME_BOUNDARY);

			ctx->base[i].idx, csid_halt_type);

	}



	CAM_DBG(CAM_ISP, "Stopping master CID idx %d", master_base_idx);