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

Commit 118d88a4 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Store slave address information from userspace" into dev/msm-4.9-camx

parents 8c2eea77 c94ac784

drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor/cam_sensor_core.c

+3 −1
Original line number Diff line number Diff line
@@ -296,6 +296,8 @@ int32_t cam_sensor_update_i2c_info(struct cam_cmd_i2c_info *i2c_info, 
			i2c_info->i2c_freq_mode);

	}



	s_ctrl->sensordata->slave_info.sensor_slave_addr =

		i2c_info->slave_addr;

	return rc;

}
@@ -628,7 +630,7 @@ int32_t cam_sensor_driver_cmd(struct cam_sensor_ctrl_t *s_ctrl, 
		}



		CAM_INFO(CAM_SENSOR,

			"Probe Succees, slot:%d slave_addr: 0x%x, slave_id: %d",

			"Probe Succees,slot:%d,slave_addr:0x%x,sensor_id:0x%x",

			s_ctrl->soc_info.index,

			s_ctrl->sensordata->slave_info.sensor_slave_addr,

			s_ctrl->sensordata->slave_info.sensor_id);