Merge "msm: sensor: restore slave address after I2C read" (0654ac04) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -523,6 +523,13 @@ static int msm_sensor_config32(struct msm_sensor_ctrl_t *s_ctrl,
		s_ctrl->sensor_i2c_client,
		read_config.reg_addr,
		&local_data, read_config.data_type);
		if (s_ctrl->sensor_i2c_client->cci_client) {
		s_ctrl->sensor_i2c_client->cci_client->sid =
		orig_slave_addr;
		} else if (s_ctrl->sensor_i2c_client->client) {
		s_ctrl->sensor_i2c_client->client->addr =
		orig_slave_addr;
		}
		if (rc < 0) {
		pr_err("%s:%d: i2c_read failed\n", __func__, __LINE__);
		break;
		@@ -914,6 +921,13 @@ int msm_sensor_config(struct msm_sensor_ctrl_t s_ctrl, void __user argp)
		s_ctrl->sensor_i2c_client,
		read_config.reg_addr,
		&local_data, read_config.data_type);
		if (s_ctrl->sensor_i2c_client->cci_client) {
		s_ctrl->sensor_i2c_client->cci_client->sid =
		orig_slave_addr;
		} else if (s_ctrl->sensor_i2c_client->client) {
		s_ctrl->sensor_i2c_client->client->addr =
		orig_slave_addr;
		}
		if (rc < 0) {
		pr_err("%s:%d: i2c_read failed\n", __func__, __LINE__);
		break;