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

Commit e38da1bd 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 if_flash_supported param in slave info"

parents 9305cbe0 ce37e4f1

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

+8 −0
Original line number Diff line number Diff line
@@ -701,6 +701,14 @@ int32_t msm_sensor_driver_probe(void *setting) 
	 */

	s_ctrl->is_probe_succeed = 1;



	/*

	 * Update the subdevice id of flash-src based on availability in kernel.

	 */

	if (slave_info->is_flash_supported == 0) {

		s_ctrl->sensordata->sensor_info->

			subdev_id[SUB_MODULE_LED_FLASH] = -1;

	}



	/*

	 * Create /dev/videoX node, comment for now until dummy /dev/videoX

	 * node is created and used by HAL

include/media/msm_cam_sensor.h

+1 −0
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ struct msm_camera_sensor_slave_info { 
	struct msm_sensor_power_setting_array power_setting_array;

	uint8_t  is_init_params_valid;

	struct msm_sensor_init_params sensor_init_params;

	uint8_t is_flash_supported;

};



struct sensorb_cfg_data {