evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: sensor: Fix to read the parameters from slave info"

Browse source
This commit is contained in:
Linux Build Service Account 2016-12-19 00:44:34 -08:00 • committed by Gerrit - the friendly Code Review server
commit 7afb1a9d65
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c
View file

@ -381,9 +381,6 @@ static int32_t msm_sensor_fill_slave_info_init_params(
if (!slave_info || !sensor_info) if (!slave_info || !sensor_info)
return -EINVAL; return -EINVAL;
if (!slave_info->is_init_params_valid)
return 0;
sensor_init_params = &slave_info->sensor_init_params; sensor_init_params = &slave_info->sensor_init_params;
if (INVALID_CAMERA_B != sensor_init_params->position) if (INVALID_CAMERA_B != sensor_init_params->position)
sensor_info->position = sensor_info->position =
@ -754,8 +751,6 @@ int32_t msm_sensor_driver_probe(void *setting,
slave_info->power_setting_array.power_down_setting = slave_info->power_setting_array.power_down_setting =
compat_ptr(slave_info32-> compat_ptr(slave_info32->
power_setting_array.power_down_setting); power_setting_array.power_down_setting);
slave_info->is_init_params_valid =
slave_info32->is_init_params_valid;
slave_info->sensor_init_params = slave_info->sensor_init_params =
slave_info32->sensor_init_params; slave_info32->sensor_init_params;
slave_info->output_format = slave_info->output_format =
@ -783,13 +778,10 @@ int32_t msm_sensor_driver_probe(void *setting,
CDBG("power up size %d power down size %d\n", CDBG("power up size %d power down size %d\n",
slave_info->power_setting_array.size, slave_info->power_setting_array.size,
slave_info->power_setting_array.size_down); slave_info->power_setting_array.size_down);
if (slave_info->is_init_params_valid) {
CDBG("position %d", CDBG("position %d",
slave_info->sensor_init_params.position); slave_info->sensor_init_params.position);
CDBG("mount %d", CDBG("mount %d",
slave_info->sensor_init_params.sensor_mount_angle); slave_info->sensor_init_params.sensor_mount_angle);
}
/* Validate camera id */ /* Validate camera id */
if (slave_info->camera_id >= MAX_CAMERAS) { if (slave_info->camera_id >= MAX_CAMERAS) {