Merge "msm: isp: Fix active stream count in immdeiate stop." (beb4f370) · Commits · e / devices / android_kernel_sony_msm8994

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

+3 −8

Original line number	Diff line number	Diff line
		@@ -1450,14 +1450,12 @@ static int msm_isp_stop_axi_stream(struct vfe_device *vfe_dev,
		stream_info->stream_src == RDI_INTF_1 \|\|
		stream_info->stream_src == RDI_INTF_2)
		wait_for_complete = 1;
		else {
		} else if (camif_update != DISABLE_CAMIF_IMMEDIATELY)
		wait_for_complete = 1;
		if (wait_for_complete == 0) {
		msm_isp_axi_stream_enable_cfg(vfe_dev, stream_info);
		stream_info->state = INACTIVE;
		}
		} else {
		if (camif_update != DISABLE_CAMIF_IMMEDIATELY)
		wait_for_complete = 1;
		}
		rc = 0;
		}
		if (wait_for_complete) {
		@@ -1474,9 +1472,6 @@ static int msm_isp_stop_axi_stream(struct vfe_device *vfe_dev,
		stream_info->state = INACTIVE;
		}
		}
		} else {
		msm_isp_axi_stream_enable_cfg(vfe_dev, stream_info);
		stream_info->state = INACTIVE;
		}

		if (camif_update == DISABLE_CAMIF) {