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

Commit 1512e325 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: isp: Fix ping pong recovery"

parents 491e1d8c d38e418e

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

+5 −0
Original line number Diff line number Diff line
@@ -1538,6 +1538,11 @@ void msm_isp_halt_send_error(struct vfe_device *vfe_dev, uint32_t event) 
	struct msm_vfe_axi_halt_cmd halt_cmd;

	uint32_t irq_status0, irq_status1;



	if (atomic_read(&vfe_dev->error_info.overflow_state) !=

		NO_OVERFLOW)

		/* Recovery is already in Progress */

		return;



	if (ISP_EVENT_PING_PONG_MISMATCH == event &&

		vfe_dev->axi_data.recovery_count < MAX_RECOVERY_THRESHOLD) {

		vfe_dev->hw_info->vfe_ops.irq_ops.