Merge "msm: camera: fd: Check detected faces limit" (fba1d790) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/camera_v2/fd/msm_fd_hw.c

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -258,10 +258,17 @@ static inline void msm_fd_hw_srst(struct msm_fd_device *fd)
	int msm_fd_hw_get_face_count(struct msm_fd_device *fd)		int msm_fd_hw_get_face_count(struct msm_fd_device *fd)
	{		{
	u32 reg;		u32 reg;
			u32 value;

	reg = msm_fd_hw_read_reg(fd, MSM_FD_IOMEM_CORE, MSM_FD_RESULT_CNT);		reg = msm_fd_hw_read_reg(fd, MSM_FD_IOMEM_CORE, MSM_FD_RESULT_CNT);

	return reg & MSM_FD_RESULT_CNT_MASK;		value = reg & MSM_FD_RESULT_CNT_MASK;
			if (value > MSM_FD_MAX_FACES_DETECTED) {
			dev_warn(fd->dev, "Face count %d out of limit\n", value);
			value = MSM_FD_MAX_FACES_DETECTED;
			}

			return value;
	}		}

	/*		/*