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

Commit a50bf345 authored by Jigarkumar Zala's avatar Jigarkumar Zala
Browse files

msm: camera: flash: Moving flash off operation in stop dev ioctl 



Currently flash off can happen as a part of flush all request.
Flush all can be trigger in between single session, and it is not
intend to flash off operation if torch is in on. This change moves
flash off operation in the stop device request, which seperates
flash off and flush all operation.

Change-Id: Iefb9468e2ce4b0bbd8974eec357be88bfacd3d40
Signed-off-by: default avatarJigarkumar Zala <jzala@codeaurora.org>
parent b048651c

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

+0 −1
Original line number Diff line number Diff line
@@ -302,7 +302,6 @@ int cam_flash_pmic_flush_request(struct cam_flash_ctrl *fctrl, 
	}



	if (type == FLUSH_ALL) {

		cam_flash_off(fctrl);

	/* flush all requests*/

		for (i = 0; i < MAX_PER_FRAME_ARRAY; i++) {

			fctrl->per_frame[i].cmn_attr.request_id = 0;

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

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ static int32_t cam_flash_driver_cmd(struct cam_flash_ctrl *fctrl, 
			goto release_mutex;

		}



		cam_flash_off(fctrl);

		fctrl->func_tbl.flush_req(fctrl, FLUSH_ALL, 0);

		fctrl->last_flush_req = 0;

		fctrl->flash_state = CAM_FLASH_STATE_ACQUIRE;