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

Commit da5d1def authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: tfe: Fix CSID probe" into camera-kernel.lnx.3.1

parents d59ab976 3e723e5d

drivers/cam_isp/isp_hw_mgr/isp_hw/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
obj-$(CONFIG_SPECTRA_CAMERA) += top_tpg/



ifdef CONFIG_SPECTRA_CAMERA_TFE

obj-$(CONFIG_SPECTRA_CAMERA) += tfe_csid_hw/ tfe_hw/ ppi_hw/

obj-$(CONFIG_SPECTRA_CAMERA) += ppi_hw/

obj-$(CONFIG_SPECTRA_CAMERA) += tfe_csid_hw/ tfe_hw/

endif



ifdef CONFIG_SPECTRA_CAMERA_IFE

drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_core.c

+2 −1
Original line number Diff line number Diff line
@@ -3255,7 +3255,8 @@ int cam_tfe_csid_hw_probe_init(struct cam_hw_intf *csid_hw_intf, 
	for (i = 0; i < CAM_CSID_PPI_HW_MAX; i++) {

		rc = cam_csid_ppi_hw_init(&tfe_csid_hw->ppi_hw_intf[i], i);

		if (rc < 0) {

			CAM_ERR(CAM_ISP, "PPI init failed for PPI %d", i);

			CAM_INFO(CAM_ISP, "PPI init failed for PPI %d", i);

			rc = 0;

			break;

		}

	}