Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit b495e8b6 authored Sep 07, 2017 by VijayaKumar T M Committed by TARKZiM Jul 27, 2020

msm: camera: isp: Check null pointer for VFE0 base



Add NULL pointer check for vfe_base of VFE0.
CRs-Fixed: 1032715
Change-Id: I540d9ff831fc9447ecf145f75ea84da3668c4f6f
Signed-off-by: VijayaKumar T M <vtmuni@codeaurora.org>

parent c9bd49a3

drivers/media/platform/msm/camera_v2/isp/msm_isp40.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -772,6 +772,11 @@ static void msm_vfe40_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->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->dual_vfe_res->vfe_base[ISP_VFE0] + 0x378);
		msm_camera_io_w_mb(update_mask,

drivers/media/platform/msm/camera_v2/isp/msm_isp44.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -630,6 +630,11 @@ static void msm_vfe44_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->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->dual_vfe_res->vfe_base[ISP_VFE0] + 0x378);
		msm_camera_io_w_mb(update_mask,

drivers/media/platform/msm/camera_v2/isp/msm_isp46.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -563,6 +563,11 @@ static void msm_vfe46_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->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->dual_vfe_res->vfe_base[ISP_VFE0] + 0x3D8);
		msm_camera_io_w_mb(update_mask,

drivers/media/platform/msm/camera_v2/isp/msm_isp47.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -600,6 +600,11 @@ static 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->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->dual_vfe_res->vfe_base[ISP_VFE0] + 0x4AB);
		msm_camera_io_w_mb(update_mask,