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

Commit f0de5057 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: Make sure the init happens before any flash operation"

parents 388cfdf9 294adc51

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

+14 −10
Original line number Diff line number Diff line 
/* Copyright (c) 2009-2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2009-2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -517,7 +517,7 @@ static int32_t msm_flash_release( 
static int32_t msm_flash_config(struct msm_flash_ctrl_t *flash_ctrl,

	void __user *argp)

{

	int32_t rc = 0;

	int32_t rc = -EINVAL;

	struct msm_flash_cfg_data_t *flash_data =

		(struct msm_flash_cfg_data_t *) argp;
@@ -530,18 +530,22 @@ static int32_t msm_flash_config(struct msm_flash_ctrl_t *flash_ctrl, 
		rc = msm_flash_init(flash_ctrl, flash_data);

		break;

	case CFG_FLASH_RELEASE:

		if (flash_ctrl->flash_state == MSM_CAMERA_FLASH_INIT)

			rc = flash_ctrl->func_tbl->camera_flash_release(

				flash_ctrl);

		break;

	case CFG_FLASH_OFF:

		if (flash_ctrl->flash_state == MSM_CAMERA_FLASH_INIT)

			rc = flash_ctrl->func_tbl->camera_flash_off(

				flash_ctrl, flash_data);

		break;

	case CFG_FLASH_LOW:

		if (flash_ctrl->flash_state == MSM_CAMERA_FLASH_INIT)

			rc = flash_ctrl->func_tbl->camera_flash_low(

				flash_ctrl, flash_data);

		break;

	case CFG_FLASH_HIGH:

		if (flash_ctrl->flash_state == MSM_CAMERA_FLASH_INIT)

			rc = flash_ctrl->func_tbl->camera_flash_high(

				flash_ctrl, flash_data);

		break;