duff/android_kernel_motorola_sm6225
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: camera: flash: Add support for regulator disable" into camera-kernel.lnx.3.1

Browse Source
This commit is contained in:
Camera Software Integration authored and Gerrit - the friendly Code Review server committed 2020-07-31 00:51:47 -07:00
2 parents 27bb083fa3 fff3bad10f
commit f47f54b5e9
1 file changed
+6 -1
Download Patch File Download Diff File Expand all files Collapse all files
drivers/cam_sensor_module/cam_flash/cam_flash_core.c
+6 -1
View File
@@ -201,8 +201,13 @@ int cam_flash_pmic_power_ops(struct cam_flash_ctrl *fctrl,
}
if (!regulator_enable) {
if ((fctrl->flash_state == CAM_FLASH_STATE_START) &&
if (((fctrl->flash_state == CAM_FLASH_STATE_START) ||
(fctrl->flash_state == CAM_FLASH_STATE_ACQUIRE)) &&
(fctrl->is_regulator_enabled == true)) {
/*
* Release dev is called after stop dev and in
* stop dev flash state is set to acquire dev.
*/
rc = cam_flash_prepare(fctrl, false);
if (rc)
CAM_ERR(CAM_FLASH,