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

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

Merge "msm: camera: sensor: Read using addr and data type" into camera-kernel.lnx.1.0

parents f241a88c 7a81e093

drivers/cam_sensor_module/cam_sensor/cam_sensor_core.c

+4 −3
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static int32_t cam_sensor_i2c_pkt_parse(struct cam_sensor_ctrl_t *s_ctrl, 
	csl_packet = (struct cam_packet *)(generic_ptr +

		(uint32_t)config.offset);



	if (cam_packet_util_validate_packet(csl_packet,

	if ((csl_packet == NULL) || cam_packet_util_validate_packet(csl_packet,

		remain_len)) {

		CAM_ERR(CAM_SENSOR, "Invalid packet params");

		rc = -EINVAL;
@@ -695,8 +695,9 @@ int cam_sensor_match_id(struct cam_sensor_ctrl_t *s_ctrl) 
	rc = camera_io_dev_read(

		&(s_ctrl->io_master_info),

		slave_info->sensor_id_reg_addr,

		&chipid, CAMERA_SENSOR_I2C_TYPE_WORD,

		CAMERA_SENSOR_I2C_TYPE_WORD);

		&chipid,

		s_ctrl->sensor_probe_addr_type,

		s_ctrl->sensor_probe_data_type);



	CAM_DBG(CAM_SENSOR, "read id: 0x%x expected id 0x%x:",

		chipid, slave_info->sensor_id);