mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-07 20:33:58 -04:00
Merge 27597eb95b on remote branch
Change-Id: I385e6bd541b34edd86c0afbf6be4a0c86be398c5
This commit is contained in:
commit
81dea19b73
1 changed files with 10 additions and 10 deletions
|
|
@ -195,10 +195,11 @@ int32_t cam_sensor_handle_random_write(
|
|||
struct list_head **list)
|
||||
{
|
||||
struct i2c_settings_list *i2c_list;
|
||||
int32_t rc = 0, cnt;
|
||||
int32_t rc = 0, cnt, payload_count;
|
||||
|
||||
payload_count = cam_cmd_i2c_random_wr->header.count;
|
||||
i2c_list = cam_sensor_get_i2c_ptr(i2c_reg_settings,
|
||||
cam_cmd_i2c_random_wr->header.count);
|
||||
payload_count);
|
||||
if (i2c_list == NULL ||
|
||||
i2c_list->i2c_settings.reg_setting == NULL) {
|
||||
CAM_ERR(CAM_SENSOR, "Failed in allocating i2c_list");
|
||||
|
|
@ -207,15 +208,14 @@ int32_t cam_sensor_handle_random_write(
|
|||
|
||||
*cmd_length_in_bytes = (sizeof(struct i2c_rdwr_header) +
|
||||
sizeof(struct i2c_random_wr_payload) *
|
||||
(cam_cmd_i2c_random_wr->header.count));
|
||||
payload_count);
|
||||
i2c_list->op_code = CAM_SENSOR_I2C_WRITE_RANDOM;
|
||||
i2c_list->i2c_settings.addr_type =
|
||||
cam_cmd_i2c_random_wr->header.addr_type;
|
||||
i2c_list->i2c_settings.data_type =
|
||||
cam_cmd_i2c_random_wr->header.data_type;
|
||||
|
||||
for (cnt = 0; cnt < (cam_cmd_i2c_random_wr->header.count);
|
||||
cnt++) {
|
||||
for (cnt = 0; cnt < payload_count; cnt++) {
|
||||
i2c_list->i2c_settings.reg_setting[cnt].reg_addr =
|
||||
cam_cmd_i2c_random_wr->random_wr_payload[cnt].reg_addr;
|
||||
i2c_list->i2c_settings.reg_setting[cnt].reg_data =
|
||||
|
|
@ -235,10 +235,11 @@ static int32_t cam_sensor_handle_continuous_write(
|
|||
struct list_head **list)
|
||||
{
|
||||
struct i2c_settings_list *i2c_list;
|
||||
int32_t rc = 0, cnt;
|
||||
int32_t rc = 0, cnt, payload_count;
|
||||
|
||||
payload_count = cam_cmd_i2c_continuous_wr->header.count;
|
||||
i2c_list = cam_sensor_get_i2c_ptr(i2c_reg_settings,
|
||||
cam_cmd_i2c_continuous_wr->header.count);
|
||||
payload_count);
|
||||
if (i2c_list == NULL ||
|
||||
i2c_list->i2c_settings.reg_setting == NULL) {
|
||||
CAM_ERR(CAM_SENSOR, "Failed in allocating i2c_list");
|
||||
|
|
@ -248,7 +249,7 @@ static int32_t cam_sensor_handle_continuous_write(
|
|||
*cmd_length_in_bytes = (sizeof(struct i2c_rdwr_header) +
|
||||
sizeof(cam_cmd_i2c_continuous_wr->reg_addr) +
|
||||
sizeof(struct cam_cmd_read) *
|
||||
(cam_cmd_i2c_continuous_wr->header.count));
|
||||
(payload_count));
|
||||
if (cam_cmd_i2c_continuous_wr->header.op_code ==
|
||||
CAMERA_SENSOR_I2C_OP_CONT_WR_BRST)
|
||||
i2c_list->op_code = CAM_SENSOR_I2C_WRITE_BURST;
|
||||
|
|
@ -265,8 +266,7 @@ static int32_t cam_sensor_handle_continuous_write(
|
|||
i2c_list->i2c_settings.size =
|
||||
cam_cmd_i2c_continuous_wr->header.count;
|
||||
|
||||
for (cnt = 0; cnt < (cam_cmd_i2c_continuous_wr->header.count);
|
||||
cnt++) {
|
||||
for (cnt = 0; cnt < payload_count; cnt++) {
|
||||
i2c_list->i2c_settings.reg_setting[cnt].reg_addr =
|
||||
cam_cmd_i2c_continuous_wr->reg_addr;
|
||||
i2c_list->i2c_settings.reg_setting[cnt].reg_data =
|
||||
|
|
|
|||
Loading…
Reference in a new issue