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

Commit 9a66dbb2 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: flash: Moving flash off operation in stop dev ioctl" into dev/msm-4.14-camx

parents 3fc94559 a50bf345

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;