summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorRahul Sharma <sharah@codeaurora.org>2017-09-05 12:19:59 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2017-09-05 01:27:17 -0700
commite34ed9a3395d9da19645ebf6fe989d5bd2a8a75b (patch)
tree0dec8f2ee3e2b94dbe446c4edb74cd18b0891306 /drivers/media
parentd727a95d2e023f5557e893aaf50a75d144f4a71e (diff)
msm: ais: isp: Check null pointer for VFE0 base
Add NULL pointer check for vfe_base of VFE0. CRs-Fixed: 1032715 Change-Id: Ie8ed5d14947d9894eb902ea514a1888be98961ef Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/msm/ais/isp/msm_isp47.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/platform/msm/ais/isp/msm_isp47.c b/drivers/media/platform/msm/ais/isp/msm_isp47.c
index d33dc758aef9..04e879fc3bcf 100644
--- a/drivers/media/platform/msm/ais/isp/msm_isp47.c
+++ b/drivers/media/platform/msm/ais/isp/msm_isp47.c
@@ -699,6 +699,12 @@ void msm_vfe47_reg_update(struct vfe_device *vfe_dev,
vfe_dev->reg_update_requested;
if ((vfe_dev->is_split && vfe_dev->pdev->id == ISP_VFE1) &&
((frame_src == VFE_PIX_0) || (frame_src == VFE_SRC_MAX))) {
+ if (!vfe_dev->common_data->dual_vfe_res->vfe_base[ISP_VFE0]) {
+ pr_err("%s vfe_base for ISP_VFE0 is NULL\n", __func__);
+ spin_unlock_irqrestore(&vfe_dev->reg_update_lock,
+ flags);
+ return;
+ }
msm_camera_io_w_mb(update_mask,
vfe_dev->common_data->dual_vfe_res->
vfe_base[ISP_VFE0] + 0x4AC);