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

Commit 5b152d64 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Avoid led off trigger during init"

parents 14d44f93 631c9883

drivers/media/platform/msm/camera_v2/sensor/flash/msm_flash.c

+9 −7
Original line number Diff line number Diff line
@@ -475,6 +475,7 @@ static int32_t msm_flash_init( 
			flash_data->cfg.flash_init_info->flash_driver_type);

	}



	if (flash_ctrl->func_tbl->camera_flash_init) {

		rc = flash_ctrl->func_tbl->camera_flash_init(

				flash_ctrl, flash_data);

		if (rc < 0) {
@@ -482,6 +483,7 @@ static int32_t msm_flash_init( 
				__func__, __LINE__, rc);

			return rc;

		}

	}



	flash_ctrl->flash_state = MSM_CAMERA_FLASH_INIT;
@@ -1180,7 +1182,7 @@ static void __exit msm_flash_exit_module(void) 
static struct msm_flash_table msm_pmic_flash_table = {

	.flash_driver_type = FLASH_DRIVER_PMIC,

	.func_tbl = {

		.camera_flash_init = msm_flash_off,

		.camera_flash_init = NULL,

		.camera_flash_release = msm_flash_release,

		.camera_flash_off = msm_flash_off,

		.camera_flash_low = msm_flash_low,