diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-20 01:37:10 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-20 01:37:09 -0700 |
| commit | 63a4b33cb4fd2fce0a76e9aa0b1e9be28afa06ae (patch) | |
| tree | 12b74693f876b40ac6d19748c4ebafec4265a464 | |
| parent | 5404e35069576a8cd8203065f60975e34a5f727b (diff) | |
| parent | 1b8eb9f5c9a18026e3572bf48d3f4513c01894c4 (diff) | |
Merge "msm: camera: sensor: Validate sensor name during probe"
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c index 7027fedaf721..2fd79a696183 100644 --- a/drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c +++ b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c @@ -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, |