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

Commit 5deed5b9 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 which prevent of memory corruption in CCI"

parents 2ae08bdf 6c2cfd84
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@
#define CCI_I2C_READ_MAX_RETRIES 3
#define CCI_I2C_MAX_READ 8192
#define CCI_I2C_MAX_WRITE 8192
#define CCI_NUM_CLK_MAX		16

static struct v4l2_subdev *g_cci_subdev;

+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@
#define CCI_PINCTRL_STATE_DEFAULT "cci_default"
#define CCI_PINCTRL_STATE_SLEEP "cci_suspend"

#define CCI_NUM_CLK_MAX	16

enum cci_i2c_queue_t {
	QUEUE_0,
	QUEUE_1,
@@ -133,7 +135,7 @@ struct cci_device {
	enum msm_cci_state_t cci_state;
	uint32_t num_clk;

	struct clk *cci_clk[5];
	struct clk *cci_clk[CCI_NUM_CLK_MAX];
	struct msm_camera_cci_i2c_queue_info
		cci_i2c_queue_info[NUM_MASTERS][NUM_QUEUES];
	struct msm_camera_cci_master_info cci_master_info[NUM_MASTERS];