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

Commit 850a9353 authored by Sridhar Gujje's avatar Sridhar Gujje Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: Fix for wrong CPAS version selection in WM start"... 

Merge "msm: camera: isp: Fix for wrong CPAS version selection in WM start" into camera-kernel.lnx.4.0
parents a3a5039b b26fbc39

drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1273,7 +1273,8 @@ static int cam_vfe_bus_start_wm( 
			return rc;

			return rc;

		}

		}

		if ((camera_hw_version > CAM_CPAS_TITAN_NONE) &&

		if ((camera_hw_version > CAM_CPAS_TITAN_NONE) &&

			(camera_hw_version < CAM_CPAS_TITAN_175_V100)) {

			(camera_hw_version < CAM_CPAS_TITAN_175_V100) &&

			(camera_hw_version != CAM_CPAS_TITAN_165_V100)) {

			struct cam_vfe_bus_ver2_reg_offset_ubwc_client

			struct cam_vfe_bus_ver2_reg_offset_ubwc_client

				*ubwc_regs;

				*ubwc_regs;