Merge "msm: camera: ife: Add check for DSP enabled in acquire" into camera-kernel.lnx.4.0 (4243c023) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1629,7 +1629,8 @@ static int cam_ife_mgr_acquire_cid_res(

		/* Acquire Left if not already acquired */
		/* For dual IFE cases, start acquiring the lower idx first */
		if (ife_ctx->is_fe_enabled \|\| in_port->usage_type)
		if (ife_ctx->is_fe_enabled \|\| in_port->usage_type \|\|
		ife_ctx->dsp_enabled)
		rc = cam_ife_hw_mgr_acquire_csid_hw(ife_hw_mgr,
		&csid_acquire, true);
		else