From 492cb2ef7cfee163fb680a0b071c9bd7a98692a3 Mon Sep 17 00:00:00 2001 From: Vijay kumar Tumati Date: Fri, 18 Mar 2016 15:54:38 +0530 Subject: msm: camera: Avoid uninitialized variables Initialize variables with default values. Change-Id: Ie615ef440ab613f0b4f0601500188068440c29fe Signed-off-by: Vijay kumar Tumati --- drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_cci_i2c.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_cci_i2c.c b/drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_cci_i2c.c index 7315327e6d12..4a31b93ec37f 100644 --- a/drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_cci_i2c.c +++ b/drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_cci_i2c.c @@ -78,6 +78,7 @@ int32_t msm_camera_cci_i2c_read_seq(struct msm_camera_i2c_client *client, cci_ctrl.cfg.cci_i2c_read_cfg.addr_type = client->addr_type; cci_ctrl.cfg.cci_i2c_read_cfg.data = buf; cci_ctrl.cfg.cci_i2c_read_cfg.num_byte = num_byte; + cci_ctrl.status = -EFAULT; rc = v4l2_subdev_call(client->cci_client->cci_subdev, core, ioctl, VIDIOC_MSM_CCI_CFG, &cci_ctrl); CDBG("%s line %d rc = %d\n", __func__, __LINE__, rc); @@ -168,6 +169,7 @@ int32_t msm_camera_cci_i2c_write_seq(struct msm_camera_i2c_client *client, cci_ctrl.cfg.cci_i2c_write_cfg.data_type = MSM_CAMERA_I2C_BYTE_DATA; cci_ctrl.cfg.cci_i2c_write_cfg.addr_type = client->addr_type; cci_ctrl.cfg.cci_i2c_write_cfg.size = num_byte; + cci_ctrl.status = -EFAULT; rc = v4l2_subdev_call(client->cci_client->cci_subdev, core, ioctl, VIDIOC_MSM_CCI_CFG, &cci_ctrl); CDBG("%s line %d rc = %d\n", __func__, __LINE__, rc); @@ -382,7 +384,7 @@ int32_t msm_camera_cci_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 = -EFAULT; int32_t i = 0; S_I2C_DBG("%s: addr: 0x%x data: 0x%x dt: %d\n", __func__, addr, data, data_type); @@ -415,7 +417,7 @@ static int32_t msm_camera_cci_i2c_set_mask(struct msm_camera_i2c_client *client, uint32_t addr, uint16_t mask, enum msm_camera_i2c_data_type data_type, uint16_t set_mask) { - int32_t rc; + int32_t rc = -EFAULT; uint16_t reg_data; rc = msm_camera_cci_i2c_read(client, addr, ®_data, data_type); -- cgit v1.2.3