Merge "msm: camera: sensor: Validate sensor name during probe" (63a4b33c) · Commits · e / devices / android_kernel_sony_msm8998

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -847,9 +847,12 @@ int32_t msm_sensor_driver_probe(void *setting,
		*/
		if (slave_info->sensor_id_info.sensor_id ==
		s_ctrl->sensordata->cam_slave_info->
		sensor_id_info.sensor_id) {
		pr_err("slot%d: sensor id%d already probed\n",
		sensor_id_info.sensor_id &&
		!(strcmp(slave_info->sensor_name,
		s_ctrl->sensordata->cam_slave_info->sensor_name))) {
		pr_err("slot%d: sensor name: %s sensor id%d already probed\n",
		slave_info->camera_id,
		slave_info->sensor_name,
		s_ctrl->sensordata->cam_slave_info->
		sensor_id_info.sensor_id);
		msm_sensor_fill_sensor_info(s_ctrl,