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

Commit 2f14b567 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: Validate sensor name during probe"

parents 2afdd4ae a61a4061

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

+6 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -776,9 +776,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,