Merge "msm: camera: cci: Modify condition check to read CCI data" into dev/msm-4.9-camx (550e4c73) · Commits · e / devices / android_kernel_fairphone_FP3

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

+6 −4

Original line number	Diff line number	Diff line
		@@ -1014,7 +1014,7 @@ static int32_t cam_cci_burst_read(struct v4l2_subdev *sd,
		read_words = cam_io_r_mb(base +
		CCI_I2C_M0_READ_BUF_LEVEL_ADDR + master * 0x100);
		total_read_words += read_words;
		do {
		while (read_words > 0) {
		val = cam_io_r_mb(base +
		CCI_I2C_M0_READ_DATA_ADDR + master * 0x100);
		for (i = 0; (i < 4) &&
		@@ -1032,7 +1032,8 @@ static int32_t cam_cci_burst_read(struct v4l2_subdev *sd,
		index++;
		}
		}
		} while (--read_words > 0);
		read_words--;
		}
		}

		rel_mutex:
		@@ -1200,7 +1201,7 @@ static int32_t cam_cci_read(struct v4l2_subdev *sd,
		index = 0;
		CAM_DBG(CAM_CCI, "index %d num_type %d", index, read_cfg->num_byte);
		first_byte = 0;
		do {
		while (read_words > 0) {
		val = cam_io_r_mb(base +
		CCI_I2C_M0_READ_DATA_ADDR + master * 0x100);
		CAM_DBG(CAM_CCI, "read val 0x%x", val);
		@@ -1217,7 +1218,8 @@ static int32_t cam_cci_read(struct v4l2_subdev *sd,
		index++;
		}
		}
		} while (--read_words > 0);
		read_words--;
		}
		rel_mutex:
		mutex_unlock(&cci_dev->cci_master_info[master].mutex_q[queue]);