Merge "msm: camera: Fix request frame while CDS is on" (d0892903) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c

+10 −2

Original line number	Diff line number	Diff line
		@@ -393,6 +393,7 @@ int msm_isp_axi_check_stream_state(
		(stream_cfg_cmd->cmd == STOP_STREAM \|\|
		stream_cfg_cmd->cmd == STOP_IMMEDIATELY)) {
		stream_info->state = ACTIVE;

		} else {
		pr_err("%s: Invalid stream state: %d\n",
		__func__, stream_info->state);
		@@ -1989,9 +1990,16 @@ int msm_isp_update_axi_stream(struct vfe_device vfe_dev, void arg)
		HANDLE_TO_IDX(update_info->stream_handle)];
		if (SRC_TO_INTF(stream_info->stream_src) >= VFE_SRC_MAX)
		continue;

		if (stream_info->state != ACTIVE &&
		stream_info->state != INACTIVE) {
		pr_err("%s: Invalid stream state\n", __func__);
		stream_info->state != INACTIVE &&
		update_cmd->update_type !=
		UPDATE_STREAM_REQUEST_FRAMES &&
		update_cmd->update_type !=
		UPDATE_STREAM_REMOVE_BUFQ) {
		pr_err("%s: Invalid stream state %d, update cmd %d\n",
		__func__, stream_info->state,
		stream_info->stream_id);
		return -EINVAL;
		}
		if (update_cmd->update_type == UPDATE_STREAM_AXI_CONFIG &&