diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-07-04 01:20:53 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-07-04 01:20:52 -0700 |
| commit | 01f0e05f48e6a9f0eff1ea603cea23886562b5c9 (patch) | |
| tree | 6c11a551531aaf0a351a4d989d4fee4019cf0d67 /drivers | |
| parent | 4d8e12a8e6830e6d1e136b7f47eadb2f23eb2500 (diff) | |
| parent | 0526198235815b576f4cf981c1bbd0d94d926dcf (diff) | |
Merge "msm: camera: add protection in the cci write function"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c | 6 |
1 files changed, 6 insertions, 0 deletions
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__); |