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

Commit 75c60faa authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: reqmgr: Hold device lock while retrieving session info" into dev/msm-4.14-camx

parents 98d98625 9507b854

drivers/media/platform/msm/ais/cam_req_mgr/cam_req_mgr_core.c

+4 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-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
@@ -2389,16 +2389,17 @@ int cam_req_mgr_link(struct cam_req_mgr_link_info *link_info) 
		return -EINVAL;

	}



	mutex_lock(&g_crm_core_dev->crm_lock);



	/* session hdl's priv data is cam session struct */

	cam_session = (struct cam_req_mgr_core_session *)

		cam_get_device_priv(link_info->session_hdl);

	if (!cam_session) {

		CAM_DBG(CAM_CRM, "NULL pointer");

		mutex_unlock(&g_crm_core_dev->crm_lock);

		return -EINVAL;

	}



	mutex_lock(&g_crm_core_dev->crm_lock);



	/* Allocate link struct and map it with session's request queue */

	link = __cam_req_mgr_reserve_link(cam_session);

	if (!link) {