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

Commit 5d480245 authored Jan 04, 2019 by Abhishek Jain

msm: camera: compilation fix in isp



Fix the compilation issue due to improper pointer assignment.

Change-Id: I14de543656e943b15a4878735325b2df2b5dba19
Signed-off-by: Abhishek Jain <abhij@codeaurora.org>

parent 01e3405d

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

+2 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2019, 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
		@@ -668,7 +668,7 @@ int vfe_hw_probe(struct platform_device *pdev)
		ISP_DBG("%s: device id = %d\n", __func__, pdev->id);

		vfe_dev->pdev = pdev;
		hw_info = &vfe_dev->hw_info;
		hw_info = vfe_dev->hw_info;

		rc = vfe_dev->hw_info->vfe_ops.platform_ops.get_platform_data(vfe_dev);
		if (rc < 0) {

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

+2 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2019, 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
		@@ -2372,7 +2372,7 @@ static void msm_isp_input_disable(struct vfe_device *vfe_dev, int cmd_type)
		vfe_dev->hw_info->vfe_ops.core_ops.update_camif_state(
		vfe_dev, DISABLE_CAMIF);
		}
		hw_info = &vfe_dev->hw_info;
		hw_info = vfe_dev->hw_info;
		/*
		* halt and reset hardware if all streams are disabled, in this case
		* ispif is halted immediately as well

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

+2 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2019, 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
		@@ -2156,7 +2156,7 @@ irqreturn_t msm_isp_process_irq(int irq_num, void *data)
		ping_pong_status =
		vfe_dev->hw_info->vfe_ops.axi_ops.get_pingpong_status(vfe_dev);

		hw_info = &vfe_dev->hw_info;
		hw_info = vfe_dev->hw_info;
		/* Get the dual IRQ status in dual mode*/
		if (vfe_dev->dual_vfe_sync_mode)
		hw_info->vfe_ops.irq_ops.read_and_clear_dual_irq_status(