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

Commit f82ecebd 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: check OIS name"

parents 092c4204 79728286

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

+10 −2
Original line number Diff line number Diff line
@@ -272,12 +272,16 @@ static int32_t msm_sensor_fill_ois_subdevid_by_name( 
{

	int32_t rc = 0;

	struct device_node *src_node = NULL;

	uint32_t val = 0;

	uint32_t val = 0, ois_name_len;

	int32_t *ois_subdev_id;

	struct  msm_sensor_info_t *sensor_info;

	struct device_node *of_node = s_ctrl->of_node;



	if (!of_node)

	if (!s_ctrl->sensordata->ois_name || !of_node)

		return -EINVAL;



	ois_name_len = strlen(s_ctrl->sensordata->ois_name);

	if (ois_name_len >= MAX_SENSOR_NAME)

		return -EINVAL;



	sensor_info = s_ctrl->sensordata->sensor_info;
@@ -288,6 +292,9 @@ static int32_t msm_sensor_fill_ois_subdevid_by_name( 
	 */

	*ois_subdev_id = -1;



	if (0 == ois_name_len)

		return 0;



	src_node = of_parse_phandle(of_node, "qcom,ois-src", 0);

	if (!src_node) {

		CDBG("%s:%d src_node NULL\n", __func__, __LINE__);
@@ -828,6 +835,7 @@ int32_t msm_sensor_driver_probe(void *setting, 
	s_ctrl->sensordata->sensor_name = slave_info->sensor_name;

	s_ctrl->sensordata->eeprom_name = slave_info->eeprom_name;

	s_ctrl->sensordata->actuator_name = slave_info->actuator_name;

	s_ctrl->sensordata->ois_name = slave_info->ois_name;

	/*

	 * Update eeporm subdevice Id by input eeprom name

	 */

include/media/camera2.h

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ struct msm_camera_sensor_board_info { 
	const char *sensor_name;

	const char *eeprom_name;

	const char *actuator_name;

	const char *ois_name;

	struct msm_camera_slave_info *slave_info;

	struct msm_camera_csi_lane_params *csi_lane_params;

	struct msm_camera_sensor_strobe_flash_data *strobe_flash_data;

include/soc/qcom/camera2.h

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ struct msm_camera_sensor_board_info { 
	const char *sensor_name;

	const char *eeprom_name;

	const char *actuator_name;

	const char *ois_name;

	struct msm_camera_slave_info *slave_info;

	struct msm_camera_csi_lane_params *csi_lane_params;

	struct msm_camera_sensor_strobe_flash_data *strobe_flash_data;