From 0526198235815b576f4cf981c1bbd0d94d926dcf Mon Sep 17 00:00:00 2001 From: Wei Ding Date: Tue, 20 Jun 2017 14:14:09 +0800 Subject: [PATCH] msm: camera: add protection in the cci write function Add state check before execute CCI function. Change-Id: I1c876e4eac70316bfe322b11f807e367c020e7d0 Signed-off-by: Wei Ding --- drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c b/drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c index 75043e1b0427..7dda92510879 100644 --- a/drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c +++ b/drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c @@ -1602,6 +1602,12 @@ static int32_t msm_cci_write(struct v4l2_subdev *sd, return rc; } + if (cci_dev->cci_state != CCI_STATE_ENABLED) { + pr_err("%s invalid cci state %d\n", + __func__, cci_dev->cci_state); + return -EINVAL; + } + if (c_ctrl->cci_info->cci_i2c_master >= MASTER_MAX || c_ctrl->cci_info->cci_i2c_master < 0) { pr_err("%s:%d Invalid I2C master addr\n", __func__, __LINE__);