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

Commit 1304e05b 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: reqmgr: Hold device lock while retrieving session info"... 

Merge "msm: camera: reqmgr: Hold device lock while retrieving session info" into kernel.lnx.4.9.r12-rel
parents 64c29dc6 5ab3cdc4

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

+3 −2
Original line number Diff line number Diff line
@@ -2432,16 +2432,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) {