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

Commit 06c0f8cc 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: Remove error log for ISP lock"

parents be0a599b e194a5dc

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

+2 −2
Original line number Diff line number Diff line
@@ -1011,7 +1011,7 @@ static int msm_isp_send_hw_cmd(struct vfe_device *vfe_dev, 
			vfe_dev->axi_data.src_info[VFE_PIX_0].last_updt_frm_id;

		if (vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id != *cfg_data

			|| update_id == *cfg_data) {

			pr_err("%s hw update lock failed acq %d, cur id %u, last id %u\n",

			ISP_DBG("%s hw update lock failed acq %d, cur id %u, last id %u\n",

				__func__,

				*cfg_data,

				vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id,
@@ -1023,7 +1023,7 @@ static int msm_isp_send_hw_cmd(struct vfe_device *vfe_dev, 
	case VFE_HW_UPDATE_UNLOCK: {

		if (vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id

			!= *cfg_data) {

			pr_err("hw update across frame boundary,begin id %u, end id %d\n",

			ISP_DBG("hw update across frame boundary,begin id %u, end id %d\n",

				*cfg_data,

				vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id);

		}