Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 911f69fe authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Fix request frame while CDS is on"

parents 69ac846d ffe07942

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

+8 −2
Original line number Diff line number Diff line
@@ -2977,8 +2977,14 @@ int msm_isp_update_axi_stream(struct vfe_device *vfe_dev, void *arg) 
		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 &&