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

Commit 0587c6ae authored by Ayush Kumar's avatar Ayush Kumar Committed by Vishvanath Singh
Browse files

Revert "msm: camera: req_mgr: Validate active sequence id in link control" 



This reverts commit 4580f024.

CRs-Fixed: 2898158
Change-Id: I29ab6ef02df0b30093c9f6a295eb74351f480a00
Signed-off-by: default avatarAyush Kumar <ayushkr@codeaurora.org>
parent cab48c73

drivers/cam_core/cam_context_utils.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

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

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

 */



#include <linux/debugfs.h>

drivers/cam_core/cam_hw_mgr_intf.h

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

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

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

 */



#ifndef _CAM_HW_MGR_INTF_H_

drivers/cam_req_mgr/cam_req_mgr_core.c

+1 −6
Original line number Diff line number Diff line
@@ -1498,7 +1498,7 @@ static int __cam_req_mgr_check_sync_req_is_ready( 
			sync_frame_duration / 2)

			link->sync_link_sof_skip = true;

		return -EINVAL;

	} else if (ready == false) {

	} else if (!ready) {

		CAM_DBG(CAM_CRM,

			"Req: %lld not ready on link: %x",

			req_id, link->link_hdl);
@@ -4447,11 +4447,6 @@ int cam_req_mgr_link_control(struct cam_req_mgr_link_control *control) 
			link->state = CAM_CRM_LINK_STATE_IDLE;

			link->skip_init_frame = false;

			crm_timer_exit(&link->watchdog);

			if ((link->activate_seq >= 0) &&

				(link->activate_seq < MAXIMUM_LINKS_PER_SESSION))

				clear_bit(link->activate_seq, g_crm_core_dev->bitmap);



			link->activate_seq = -1;

			spin_unlock_bh(&link->link_state_spin_lock);

			CAM_DBG(CAM_CRM,

				"De-activate link: 0x%x", link->link_hdl);