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

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

Merge "msm: camera: sensor: Fix camera cci hw delay issue" into dev/msm-4.9-camx

parents a80a4b50 062a16b6

drivers/media/platform/msm/camera/cam_sensor_module/cam_cci/cam_cci_soc.c

+1 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018, 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
@@ -390,7 +390,6 @@ int cam_cci_soc_release(struct cci_device *cci_dev) 


	cci_dev->cci_state = CCI_STATE_DISABLED;

	cci_dev->cycles_per_us = 0;

	soc_info->src_clk_idx = 0;



	cam_cpas_stop(cci_dev->cpas_handle);

drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_utils/cam_sensor_util.c

+4 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018, 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
@@ -147,7 +147,7 @@ int32_t cam_sensor_handle_poll( 
		sizeof(uint32_t);

	(*byte_cnt) += sizeof(struct cam_cmd_conditional_wait);



	(*offset) += 1;

	*offset = 1;

	*list_ptr = &(i2c_list->list);



	return rc;
@@ -191,7 +191,7 @@ int32_t cam_sensor_handle_random_write( 
		i2c_list->i2c_settings.

			reg_setting[cnt].data_mask = 0;

	}

	(*offset) += cnt;

	*offset = cnt;

	*list = &(i2c_list->list);



	return rc;
@@ -246,7 +246,7 @@ static int32_t cam_sensor_handle_continuous_write( 
		i2c_list->i2c_settings.

			reg_setting[cnt].data_mask = 0;

	}

	(*offset) += cnt;

	*offset = cnt;

	*list = &(i2c_list->list);



	return rc;