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

Merge "msm: camera: Handle actuator close before power down"

Browse source
This commit is contained in:
Linux Build Service Account 2018-02-16 14:41:51 -08:00 • committed by Gerrit - the friendly Code Review server
commit 47aeb59367
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c
View file

@ -1573,6 +1573,13 @@ static int msm_actuator_close(struct v4l2_subdev *sd,
} }
kfree(a_ctrl->i2c_reg_tbl); kfree(a_ctrl->i2c_reg_tbl);
a_ctrl->i2c_reg_tbl = NULL; a_ctrl->i2c_reg_tbl = NULL;
if (a_ctrl->actuator_state == ACT_OPS_ACTIVE) {
rc = msm_actuator_power_down(a_ctrl);
if (rc < 0) {
pr_err("%s:%d Actuator Power down failed\n",
__func__, __LINE__);
}
}
a_ctrl->actuator_state = ACT_DISABLE_STATE; a_ctrl->actuator_state = ACT_DISABLE_STATE;
mutex_unlock(a_ctrl->actuator_mutex); mutex_unlock(a_ctrl->actuator_mutex);
CDBG("Exit\n"); CDBG("Exit\n");