Merge "msm: camera: sensor: Turn off the flash while flushing" into camera-kernel.lnx.4.0 (078fae79) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/cam_sensor_module/cam_flash/cam_flash_core.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -232,7 +232,6 @@ int cam_flash_pmic_flush_request(struct cam_flash_ctrl *fctrl,
		if ((flash_data->opcode ==
		CAMERA_SENSOR_FLASH_OP_OFF) &&
		(flash_data->cmn_attr.request_id > 0) &&
		(flash_data->cmn_attr.request_id <= req_id) &&
		flash_data->cmn_attr.is_settings_valid) {
		is_off_needed = true;
		CAM_DBG(CAM_FLASH,
		@@ -463,7 +462,7 @@ int cam_flash_off(struct cam_flash_ctrl *flash_ctrl)
		CAM_ERR(CAM_FLASH, "Flash control Null");
		return -EINVAL;
		}

		CAM_DBG(CAM_FLASH, "Flash OFF Triggered");
		if (flash_ctrl->switch_trigger)
		cam_res_mgr_led_trigger_event(flash_ctrl->switch_trigger,
		(enum led_brightness)LED_SWITCH_OFF);
		@@ -1541,6 +1540,8 @@ int cam_flash_pmic_pkt_parser(struct cam_flash_ctrl fctrl, void arg)
		flash_data->led_current_ma[i]
		= flash_operation_info->led_current_ma[i];

		CAM_DBG(CAM_FLASH,
		"FLASH_CMD_TYPE op:%d", flash_data->opcode);
		if (flash_data->opcode == CAMERA_SENSOR_FLASH_OP_OFF)
		add_req.skip_before_applying \|= SKIP_NEXT_FRAME;