Merge tag 'LA.UM.9.12.r1-18500-SMxx50.QSSI14.0' of https://git.codelinaro.org/clo/la/platform/vendor/opensource/camera-kernel into android13-4.19-kona

LA.UM.9.12.r1-18500-SMxx50.QSSI14.0

* tag 'LA.UM.9.12.r1-18500-SMxx50.QSSI14.0' of https://git.codelinaro.org/clo/la/platform/vendor/opensource/camera-kernel:
  msm: camera: sensor: handling condition for random read
  msm: camera: memmgr: Remove the mutex lock for kref variable

Change-Id: If9f25f4c833965e83ea19a60de3bbd515dc81144
This commit is contained in:
Michael Bestas
2024-11-04 04:07:58 +02:00

View File

@@ -289,10 +289,11 @@ static int32_t cam_sensor_handle_random_read(
struct cam_buf_io_cfg *io_cfg)
{
struct i2c_settings_list *i2c_list;
int32_t rc = 0, cnt = 0;
int32_t rc = 0, cnt = 0, payload_count = 0;
payload_count = cmd_i2c_random_rd->header.count;
i2c_list = cam_sensor_get_i2c_ptr(i2c_reg_settings,
cmd_i2c_random_rd->header.count);
payload_count);
if ((i2c_list == NULL) ||
(i2c_list->i2c_settings.reg_setting == NULL)) {
CAM_ERR(CAM_SENSOR,
@@ -307,7 +308,7 @@ static int32_t cam_sensor_handle_random_read(
} else {
*cmd_length_in_bytes = sizeof(struct i2c_rdwr_header) +
(sizeof(struct cam_cmd_read) *
(cmd_i2c_random_rd->header.count));
payload_count);
i2c_list->op_code = CAM_SENSOR_I2C_READ_RANDOM;
i2c_list->i2c_settings.addr_type =
cmd_i2c_random_rd->header.addr_type;
@@ -316,8 +317,7 @@ static int32_t cam_sensor_handle_random_read(
i2c_list->i2c_settings.size =
cmd_i2c_random_rd->header.count;
for (cnt = 0; cnt < (cmd_i2c_random_rd->header.count);
cnt++) {
for (cnt = 0; cnt < payload_count; cnt++) {
i2c_list->i2c_settings.reg_setting[cnt].reg_addr =
cmd_i2c_random_rd->data_read[cnt].reg_data;
}