diff options
| author | Vijay kumar Tumati <vtumati@codeaurora.org> | 2016-04-01 17:03:43 +0530 |
|---|---|---|
| committer | Kyle Yan <kyan@codeaurora.org> | 2016-04-29 14:41:27 -0700 |
| commit | 11eb50a115e137f72d58dc6fd76f9935ccedab7a (patch) | |
| tree | 2a1efa4c8e1682a24a4891ca66de50bcc9fab0f7 | |
| parent | 4ccef09c65ef507bf72354ef541781e9cbd6860e (diff) | |
msm: camera: Avoid uninitialized variables and add null checks
Initialize variables with default values and add null check to
avoid crashes.
Change-Id: I3357d504b624b0af2f0710ee237ec13d4460c6bc
Signed-off-by: Vijay kumar Tumati <vtumati@codeaurora.org>
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c | 5 | ||||
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_qup_i2c.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c b/drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c index 8e5064637f73..ea5d251c574f 100644 --- a/drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c +++ b/drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c @@ -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, diff --git a/drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_qup_i2c.c b/drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_qup_i2c.c index f542ec2e26bf..3b101798edac 100644 --- a/drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_qup_i2c.c +++ b/drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_qup_i2c.c @@ -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); |