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

Commit 97705519 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents b7ead560 9e570aa9

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

+6 −0
Original line number Diff line number Diff line
@@ -717,6 +717,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

+7 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -558,6 +558,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

+7 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -498,6 +498,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
@@ -714,6 +714,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);