Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f47f54b5 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 27bb083f fff3bad1

drivers/cam_sensor_module/cam_flash/cam_flash_core.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -201,8 +201,13 @@ int cam_flash_pmic_power_ops(struct cam_flash_ctrl *fctrl, 
	}

	}





	if (!regulator_enable) {

	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)) {

			(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);

			rc = cam_flash_prepare(fctrl, false);

			if (rc)

			if (rc)

				CAM_ERR(CAM_FLASH,

				CAM_ERR(CAM_FLASH,