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

Commit 135d6c3f 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: sensor: Add ois_name to slave_info"

parents 95d9b560 e2a55d10

drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c

+3 −0
Original line number Diff line number Diff line
@@ -406,6 +406,9 @@ int32_t msm_sensor_driver_probe(void *setting) 
		strlcpy(slave_info->sensor_name, setting32.sensor_name,

			sizeof(slave_info->sensor_name));



		strlcpy(slave_info->ois_name, setting32.ois_name,

			sizeof(slave_info->ois_name));



		slave_info->addr_type = setting32.addr_type;

		slave_info->camera_id = setting32.camera_id;

include/media/msm_cam_sensor.h

+1 −0
Original line number Diff line number Diff line
@@ -504,6 +504,7 @@ struct msm_camera_sensor_slave_info32 { 
	char sensor_name[32];

	char eeprom_name[32];

	char actuator_name[32];

	char ois_name[32];

	enum msm_sensor_camera_id_t camera_id;

	uint16_t slave_addr;

	enum i2c_freq_mode_t i2c_freq_mode;