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

Commit 3c763dc3 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: isp: Fix freeze of preview stream during CDS"

parents fc187e81 4c2c5383

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

+0 −7
Original line number Diff line number Diff line
@@ -3722,13 +3722,6 @@ static int msm_isp_stream_axi_cfg_update(struct vfe_device *vfe_dev, 
	unsigned long flags;

	int vfe_idx;



	if (atomic_read(&vfe_dev->axi_data.axi_cfg_update[

		SRC_TO_INTF(stream_info->stream_src)])) {

		pr_err("%s: Update in progress for vfe %d intf %d\n",

			__func__, vfe_dev->pdev->id,

			SRC_TO_INTF(stream_info->stream_src));

		return -EINVAL;

	}

	spin_lock_irqsave(&stream_info->lock, flags);

	if (stream_info->state != ACTIVE) {

		spin_unlock_irqrestore(&stream_info->lock, flags);