Merge "msm: camera: isp: Fix excessive logging in w+t" (286d3aa6) · Commits · e / devices / android_kernel_sony_msm8998

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -844,7 +844,6 @@ static void msm_isp_sync_dual_cam_frame_id(
		}
		}

		WARN_ON(ms_res->dual_sync_mode == MSM_ISP_DUAL_CAM_ASYNC);
		/* find highest frame id */
		for (i = 0; i < MAX_VFE * VFE_SRC_MAX; i++) {
		if (ms_res->src_info[i] == NULL)
		@@ -918,7 +917,7 @@ void msm_isp_increment_frame_id(struct vfe_device *vfe_dev,
		*/
		if (ms_res->src_sof_mask & (1 <<
		src_info->dual_hw_ms_info.index)) {
		pr_err("Frame out of sync on vfe %d\n",
		pr_err_ratelimited("Frame out of sync on vfe %d\n",
		vfe_dev->pdev->id);
		/*
		* set this isp as async mode to force