Merge "msm: camera: sensor: Delete request even if apply failed" into dev/msm-4.14-camx (e8d58d76) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor/cam_sensor_core.c

+10 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-2019, 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
		@@ -937,9 +937,13 @@ int32_t cam_sensor_driver_cmd(struct cam_sensor_ctrl_t *s_ctrl,

		rc = cam_sensor_apply_settings(s_ctrl, 0,
		CAM_SENSOR_PACKET_OPCODE_SENSOR_INITIAL_CONFIG);

		s_ctrl->i2c_data.init_settings.request_id = -1;

		if (rc < 0) {
		CAM_ERR(CAM_SENSOR,
		"cannot apply init settings");
		delete_request(&s_ctrl->i2c_data.init_settings);
		goto release_mutex;
		}
		rc = delete_request(&s_ctrl->i2c_data.init_settings);
		@@ -948,16 +952,20 @@ int32_t cam_sensor_driver_cmd(struct cam_sensor_ctrl_t *s_ctrl,
		"Fail in deleting the Init settings");
		goto release_mutex;
		}
		s_ctrl->i2c_data.init_settings.request_id = -1;
		}

		if (s_ctrl->i2c_data.config_settings.is_settings_valid &&
		(s_ctrl->i2c_data.config_settings.request_id == 0)) {
		rc = cam_sensor_apply_settings(s_ctrl, 0,
		CAM_SENSOR_PACKET_OPCODE_SENSOR_CONFIG);

		s_ctrl->i2c_data.config_settings.request_id = -1;

		if (rc < 0) {
		CAM_ERR(CAM_SENSOR,
		"cannot apply config settings");
		delete_request(
		&s_ctrl->i2c_data.config_settings);
		goto release_mutex;
		}
		rc = delete_request(&s_ctrl->i2c_data.config_settings);
		@@ -967,7 +975,6 @@ int32_t cam_sensor_driver_cmd(struct cam_sensor_ctrl_t *s_ctrl,
		goto release_mutex;
		}
		s_ctrl->sensor_state = CAM_SENSOR_CONFIG;
		s_ctrl->i2c_data.config_settings.request_id = -1;
		}
		}
		break;