Merge "msm: camera: isp: Check for epoch before applying" into camera-kernel.lnx.4.0 (9d379444) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/cam_isp/cam_isp_context.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1108,7 +1108,9 @@ static int __cam_isp_ctx_apply_req_offline(
		goto end;
		}

		if (ctx->state != CAM_CTX_ACTIVATED)
		if ((ctx->state != CAM_CTX_ACTIVATED) \|\|
		(!atomic_read(&ctx_isp->rxd_epoch)) \|\|
		(ctx_isp->substate_activated == CAM_ISP_CTX_ACTIVATED_APPLIED))
		goto end;

		if (ctx_isp->active_req_cnt >= 2)