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

Merge "msm: ais: Corrected sensor state in power up"

Browse source
This commit is contained in:
Linux Build Service Account 2018-06-28 23:54:19 -07:00 • committed by Gerrit - the friendly Code Review server
commit ee11b4113e
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/media/platform/msm/ais/common/cam_soc_api.c
View file

@ -26,6 +26,7 @@
#include <linux/msm-bus.h> #include <linux/msm-bus.h>
#include "cam_soc_api.h" #include "cam_soc_api.h"
#include "msm_camera_diag_util.h" #include "msm_camera_diag_util.h"
#include <linux/clk/msm-clock-generic.h>
struct msm_cam_bus_pscale_data { struct msm_cam_bus_pscale_data {
struct msm_bus_scale_pdata *pdata; struct msm_bus_scale_pdata *pdata;
@ -362,6 +363,7 @@ int msm_camera_clk_enable(struct device *dev,
clk_info[i].clk_name); clk_info[i].clk_name);
goto cam_clk_set_err; goto cam_clk_set_err;
} }
clk_ptr[i]->flags |= CLKFLAG_NO_RATE_CACHE;
rc = clk_set_rate(clk_ptr[i], rc = clk_set_rate(clk_ptr[i],
clk_rate); clk_rate);
if (rc < 0) { if (rc < 0) {
@ -383,6 +385,7 @@ int msm_camera_clk_enable(struct device *dev,
goto cam_clk_set_err; goto cam_clk_set_err;
} }
} }
clk_ptr[i]->flags |= CLKFLAG_NO_RATE_CACHE;
rc = clk_set_rate(clk_ptr[i], rc = clk_set_rate(clk_ptr[i],
clk_rate); clk_rate);
if (rc < 0) { if (rc < 0) {

6
drivers/media/platform/msm/ais/sensor/msm_sensor.c
View file

@ -842,7 +842,8 @@ static int msm_sensor_config32(struct msm_sensor_ctrl_t *s_ctrl,
if (s_ctrl->is_csid_tg_mode) if (s_ctrl->is_csid_tg_mode)
goto DONE; goto DONE;
if (s_ctrl->sensor_state != MSM_SENSOR_POWER_DOWN) { if ((s_ctrl->sensor_state != MSM_SENSOR_POWER_DOWN) &&
(s_ctrl->sensor_state != MSM_SENSOR_CCI_DOWN)) {
pr_err("%s:%d failed: invalid state %d\n", __func__, pr_err("%s:%d failed: invalid state %d\n", __func__,
__LINE__, s_ctrl->sensor_state); __LINE__, s_ctrl->sensor_state);
rc = -EFAULT; rc = -EFAULT;
@ -1403,7 +1404,8 @@ int msm_sensor_config(struct msm_sensor_ctrl_t *s_ctrl, void *argp)
if (s_ctrl->is_csid_tg_mode) if (s_ctrl->is_csid_tg_mode)
goto DONE; goto DONE;
if (s_ctrl->sensor_state != MSM_SENSOR_POWER_DOWN) { if ((s_ctrl->sensor_state != MSM_SENSOR_POWER_DOWN) &&
(s_ctrl->sensor_state != MSM_SENSOR_CCI_DOWN)) {
pr_err("%s:%d failed: invalid state %d\n", __func__, pr_err("%s:%d failed: invalid state %d\n", __func__,
__LINE__, s_ctrl->sensor_state); __LINE__, s_ctrl->sensor_state);
rc = -EFAULT; rc = -EFAULT;