Merge "msm: camera: lrme: Handle release lock when returning from error case" (c3ebb2d5) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera/cam_lrme/lrme_hw_mgr/lrme_hw/cam_lrme_hw_core.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -899,7 +899,7 @@ int cam_lrme_hw_stop(void hw_priv, void hw_stop_args, uint32_t arg_size)
		lrme_core->state = CAM_LRME_CORE_STATE_INIT;
		} else {
		CAM_ERR(CAM_LRME, "HW in wrong state %d", lrme_core->state);
		return -EINVAL;
		rc = -EINVAL;
		}

		unlock:
		@@ -951,7 +951,8 @@ int cam_lrme_hw_submit_req(void hw_priv, void hw_submit_args,

		if (lrme_core->req_submit != NULL) {
		CAM_ERR(CAM_LRME, "req_submit is not NULL");
		return -EBUSY;
		rc = -EBUSY;
		goto error;
		}

		rc = cam_lrme_hw_util_submit_req(lrme_core, frame_req);