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

Commit 37a33666 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: icp: lock before updating clock status"

parents 7adf0889 13020331

drivers/media/platform/msm/camera/cam_icp/icp_hw/bps_hw/bps_core.c

+6 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2020, 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
@@ -300,6 +300,7 @@ int cam_bps_process_cmd(void *device_priv, uint32_t cmd_type, 
	struct cam_bps_device_core_info *core_info = NULL;

	struct cam_bps_device_hw_info *hw_info = NULL;

	int rc = 0;

	unsigned long flags;



	if (!device_priv) {

		CAM_ERR(CAM_ICP, "Invalid arguments");
@@ -393,12 +394,16 @@ int cam_bps_process_cmd(void *device_priv, uint32_t cmd_type, 
		}

		break;

	case CAM_ICP_BPS_CMD_DISABLE_CLK:

		spin_lock_irqsave(&bps_dev->hw_lock, flags);

		if (core_info->clk_enable == true)

			cam_bps_toggle_clk(soc_info, false);

		core_info->clk_enable = false;

		spin_unlock_irqrestore(&bps_dev->hw_lock, flags);

		break;

	case CAM_ICP_BPS_CMD_RESET:

		spin_lock_irqsave(&bps_dev->hw_lock, flags);

		rc = cam_bps_cmd_reset(soc_info, core_info);

		spin_unlock_irqrestore(&bps_dev->hw_lock, flags);

		break;

	default:

		CAM_ERR(CAM_ICP, "Invalid Cmd Type:%u", cmd_type);

drivers/media/platform/msm/camera/cam_icp/icp_hw/ipe_hw/ipe_core.c

+6 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2020, 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
@@ -300,6 +300,7 @@ int cam_ipe_process_cmd(void *device_priv, uint32_t cmd_type, 
	struct cam_ipe_device_core_info *core_info = NULL;

	struct cam_ipe_device_hw_info *hw_info = NULL;

	int rc = 0;

	unsigned long flags;



	if (!device_priv) {

		CAM_ERR(CAM_ICP, "Invalid arguments");
@@ -388,12 +389,16 @@ int cam_ipe_process_cmd(void *device_priv, uint32_t cmd_type, 
		}

		break;

	case CAM_ICP_IPE_CMD_DISABLE_CLK:

		spin_lock_irqsave(&ipe_dev->hw_lock, flags);

		if (core_info->clk_enable == true)

			cam_ipe_toggle_clk(soc_info, false);

		core_info->clk_enable = false;

		spin_unlock_irqrestore(&ipe_dev->hw_lock, flags);

		break;

	case CAM_ICP_IPE_CMD_RESET:

		spin_lock_irqsave(&ipe_dev->hw_lock, flags);

		rc = cam_ipe_cmd_reset(soc_info, core_info);

		spin_unlock_irqrestore(&ipe_dev->hw_lock, flags);

		break;

	default:

		CAM_ERR(CAM_ICP, "Invalid Cmd Type:%u", cmd_type);