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

Commit 89be600d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Fix KW issues in sensor code"

parents 9f5a4cd5 8dd0da35

drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c

+5 −0
Original line number Diff line number Diff line
@@ -863,6 +863,11 @@ static int msm_eeprom_i2c_remove(struct i2c_client *client) 
		return 0;

	}



	if (!e_ctrl->eboard_info) {

		pr_err("%s: eboard_info is NULL\n", __func__);

		return 0;

	}



	msm_camera_put_clk_info(e_ctrl->pdev,

		&e_ctrl->eboard_info->power_info.clk_info,

		&e_ctrl->eboard_info->power_info.clk_ptr,

drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_qup_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ int32_t msm_camera_qup_i2c_poll(struct msm_camera_i2c_client *client, 
	uint32_t addr, uint16_t data,

	enum msm_camera_i2c_data_type data_type, uint32_t delay_ms)

{

	int32_t rc;

	int32_t rc = 0;

	int i;

	S_I2C_DBG("%s: addr: 0x%x data: 0x%x dt: %d\n",

		__func__, addr, data, data_type);