Merge "msm: camera: isp: Unlock spinlock in fatal error for CSID" into camera-kernel.lnx.1.0 (d219cc3a) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -3353,7 +3353,8 @@ int cam_ife_csid_release(void *hw_priv,
		csid_hw->ipp_path_config.measure_enabled = 0;
		else if (res->res_id == CAM_IFE_PIX_PATH_RES_PPP)
		csid_hw->ppp_path_config.measure_enabled = 0;
		else
		else if (res->res_id >= CAM_IFE_PIX_PATH_RES_RDI_0 &&
		res->res_id <= CAM_IFE_PIX_PATH_RES_RDI_3)
		csid_hw->rdi_path_config[res->res_id].measure_enabled
		= 0;
		break;
		@@ -4514,6 +4515,8 @@ irqreturn_t cam_ife_csid_irq(int irq_num, void *data)
		csid_hw->error_irq_count++;
		}
		}

		handle_fatal_error:
		spin_unlock_irqrestore(&csid_hw->lock_state, flags);

		if (csid_hw->error_irq_count >
		@@ -4522,8 +4525,6 @@ irqreturn_t cam_ife_csid_irq(int irq_num, void *data)
		csid_hw->error_irq_count = 0;
		}

		handle_fatal_error:

		if (fatal_err_detected) {
		cam_ife_csid_halt_csi2(csid_hw);
		cam_csid_handle_hw_err_irq(csid_hw,