Merge "msm: camera: flash: Remove regulator power up/down from early PCR" into dev/msm-4.14-camx (7fd7a065) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/media/platform/msm/camera/cam_sensor_module/cam_flash/cam_flash_core.c

+2 −21

Original line number	Diff line number	Diff line
		@@ -729,12 +729,7 @@ int cam_flash_pmic_apply_setting(struct cam_flash_ctrl *fctrl,
		fctrl->flash_state);
		return -EINVAL;
		}
		rc = cam_flash_prepare(fctrl, true);
		if (rc) {
		CAM_ERR(CAM_FLASH,
		"Enable Regulator Failed rc = %d", rc);
		return rc;
		}

		rc = cam_flash_high(fctrl, flash_data);
		if (rc)
		CAM_ERR(CAM_FLASH,
		@@ -749,12 +744,7 @@ int cam_flash_pmic_apply_setting(struct cam_flash_ctrl *fctrl,
		fctrl->flash_state);
		return -EINVAL;
		}
		rc = cam_flash_prepare(fctrl, true);
		if (rc) {
		CAM_ERR(CAM_FLASH,
		"Enable Regulator Failed rc = %d", rc);
		return rc;
		}

		rc = cam_flash_low(fctrl, flash_data);
		if (rc)
		CAM_ERR(CAM_FLASH,
		@@ -769,15 +759,6 @@ int cam_flash_pmic_apply_setting(struct cam_flash_ctrl *fctrl,
		rc);
		return rc;
		}
		if ((fctrl->flash_state ==
		CAM_FLASH_STATE_START) &&
		(fctrl->is_regulator_enabled == true)) {
		rc = cam_flash_prepare(fctrl, false);
		if (rc)
		CAM_ERR(CAM_FLASH,
		"Disable Regulator failed: %d",
		rc);
		}
		}
		} else if (fctrl->nrt_info.cmn_attr.cmd_type ==
		CAMERA_SENSOR_FLASH_CMD_TYPE_WIDGET) {