Merge "msm: camera: ope: Move request id validity check outside of lock" into camera-kernel.lnx.3.1 (1bf95277) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -1190,15 +1190,15 @@ static void cam_ope_ctx_cdm_callback(uint32_t handle, void *userdata,
		CAM_DBG(CAM_OPE, "CDM hdl=%x, udata=%pK, status=%d, cookie=%llu",
		handle, userdata, status, cookie);

		ctx = userdata;

		mutex_lock(&ctx->ctx_mutex);

		if (cookie >= CAM_CTX_REQ_MAX) {
		CAM_ERR(CAM_OPE, "Invalid reqIdx = %llu", cookie);
		goto end;
		return;
		}

		ctx = userdata;

		mutex_lock(&ctx->ctx_mutex);

		if (!test_bit(cookie, ctx->bitmap)) {
		CAM_INFO(CAM_OPE, "Request not present reqIdx = %d", cookie);
		goto end;