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 9d24ba00 authored Sep 05, 2017 by VijayaKumar T M Committed by Gerrit - the friendly Code Review server Sep 08, 2017

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: Haibin Liu <haibinl@codeaurora.org>
Signed-off-by: VijayaKumar T M <vtmuni@codeaurora.org>

parent cb8f9c4d

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -702,6 +702,12 @@ 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->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]
		+ 0x378);

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -560,6 +560,12 @@ 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->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]
		+ 0x378);

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -499,6 +499,12 @@ 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->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]
		+ 0x3D8);

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -735,6 +735,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);