Merge "msm: isp: Recover VFE when epoch mismatch happens"

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -634,7 +634,7 @@ void msm_isp_process_reg_upd_epoch_irq(struct vfe_device *vfe_dev,
		spin_unlock_irqrestore(&stream_info->lock, flags);
		if (ret < 0) {
		msm_isp_halt_send_error(vfe_dev,
		ISP_EVENT_BUF_FATAL_ERROR);
		ISP_EVENT_PING_PONG_MISMATCH);
		return;
		}
		continue;