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

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

Merge "msm: camera: Fix UBSAN compilation failures"

parents ec704b1b 8097672c

drivers/media/platform/msm/camera/cam_cdm/cam_cdm_util.c

+0 −31
Original line number Diff line number Diff line
@@ -318,37 +318,6 @@ struct cam_cdm_utils_ops CDM170_ops = { 
	cdm_write_genirq,

};



void cam_cdm_data_alignement_check(void)

{

	BUILD_BUG_ON(sizeof(struct cdm_dmi_cmd) !=

		(CAM_CDM_DWORD * cdm_get_cmd_header_size(CAM_CDM_CMD_DMI)));

	BUILD_BUG_ON(sizeof(struct cdm_regcontinuous_cmd) !=

		(CAM_CDM_DWORD *

		cdm_get_cmd_header_size(CAM_CDM_CMD_REG_CONT)));

	BUILD_BUG_ON(sizeof(struct cdm_regrandom_cmd) !=

		(CAM_CDM_DWORD *

		cdm_get_cmd_header_size(CAM_CDM_CMD_REG_RANDOM)));

	BUILD_BUG_ON(sizeof(struct cdm_indirect_cmd) !=

		(CAM_CDM_DWORD *

		cdm_get_cmd_header_size(CAM_CDM_CMD_BUFF_INDIRECT)));

	BUILD_BUG_ON(sizeof(struct cdm_genirq_cmd) !=

		(CAM_CDM_DWORD *

		cdm_get_cmd_header_size(CAM_CDM_CMD_GEN_IRQ)));

	BUILD_BUG_ON(sizeof(struct cdm_wait_event_cmd) !=

		(CAM_CDM_DWORD *

		cdm_get_cmd_header_size(CAM_CDM_CMD_WAIT_EVENT)));

	BUILD_BUG_ON(sizeof(struct cdm_changebase_cmd) !=

		(CAM_CDM_DWORD *

		cdm_get_cmd_header_size(CAM_CDM_CMD_CHANGE_BASE)));

	BUILD_BUG_ON(sizeof(struct  cdm_perf_ctrl_cmd) !=

		(CAM_CDM_DWORD *

		cdm_get_cmd_header_size(CAM_CDM_CMD_PERF_CTRL)));

	BUILD_BUG_ON(sizeof(struct cdm_dmi_cmd) !=

		(CAM_CDM_DWORD * cdm_get_cmd_header_size(CAM_CDM_CMD_DMI_32)));

	BUILD_BUG_ON(sizeof(struct cdm_dmi_cmd) !=

		(CAM_CDM_DWORD * cdm_get_cmd_header_size(CAM_CDM_CMD_DMI_64)));

}



int cam_cdm_get_ioremap_from_base(uint32_t hw_base,

	uint32_t base_array_size,

	struct cam_soc_reg_map *base_table[CAM_SOC_MAX_BLOCK],