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

Commit 37bdc73f authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: core: Change log message to rate limited" into dev/msm-4.14-camx

parents 6dbd8304 49f69f74

drivers/media/platform/msm/camera/cam_cpas/cpas_top/cam_cpastop_hw.c

+2 −1
Original line number Diff line number Diff line
@@ -405,7 +405,8 @@ static void cam_cpastop_work(struct work_struct *work) 
		if ((payload->irq_status & camnoc_info->irq_err[i].sbm_port) &&

			(camnoc_info->irq_err[i].enable)) {

			irq_type = camnoc_info->irq_err[i].irq_type;

			CAM_ERR(CAM_CPAS, "Error occurred, type=%d", irq_type);

			CAM_ERR_RATE_LIMIT(CAM_CPAS,

				"Error occurred, type=%d", irq_type);

			memset(&irq_data, 0x0, sizeof(irq_data));

			irq_data.irq_type = (enum cam_camnoc_irq_type)irq_type;

drivers/media/platform/msm/camera/cam_smmu/cam_smmu_api.c

+1 −1
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ static int cam_smmu_iommu_fault_handler(struct iommu_domain *domain, 
	}



	if (++iommu_cb_set.cb_info[idx].pf_count > g_num_pf_handled) {

		CAM_INFO(CAM_SMMU, "PF already handled %d %d %d",

		CAM_INFO_RATE_LIMIT(CAM_SMMU, "PF already handled %d %d %d",

			g_num_pf_handled, idx,

			iommu_cb_set.cb_info[idx].pf_count);

		return -EINVAL;