Merge "msm: camera: isp: Avoid cuncurrency between CRM operations" into dev/msm-4.14-camx (43118137) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/media/platform/msm/camera/cam_core/cam_context.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -172,6 +172,7 @@ int cam_context_handle_crm_apply_req(struct cam_context *ctx,
		return -EINVAL;
		}

		mutex_lock(&ctx->ctx_mutex);
		if (ctx->state_machine[ctx->state].crm_ops.apply_req) {
		rc = ctx->state_machine[ctx->state].crm_ops.apply_req(ctx,
		apply);
		@@ -180,6 +181,7 @@ int cam_context_handle_crm_apply_req(struct cam_context *ctx,
		ctx->dev_hdl, ctx->state);
		rc = -EPROTO;
		}
		mutex_unlock(&ctx->ctx_mutex);

		return rc;
		}