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

Commit 7ea6cea7 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: reqmgr: Allow requests to be submitted in IDLE state" into... 

Merge "msm: camera: reqmgr: Allow requests to be submitted in IDLE state" into camera-kernel.lnx.4.0
parents 9b8cae4b a358e148

drivers/cam_req_mgr/cam_req_mgr_core.c

+3 −11
Original line number Diff line number Diff line
@@ -2857,20 +2857,12 @@ static int cam_req_mgr_cb_add_req(struct cam_req_mgr_add_request *add_req) 
	}



	CAM_DBG(CAM_REQ,

		"dev name %s dev_hdl %d dev req %lld, trigger_eof: %d",

		"dev name %s dev_hdl %d dev req %lld, trigger_eof %d link_state %d",

		__cam_req_mgr_dev_handle_to_name(add_req->dev_hdl, link),

		add_req->dev_hdl, add_req->req_id, add_req->trigger_eof);

		add_req->dev_hdl, add_req->req_id, add_req->trigger_eof,

		link->state);



	mutex_lock(&link->lock);

	spin_lock_bh(&link->link_state_spin_lock);

	if (link->state < CAM_CRM_LINK_STATE_READY) {

		CAM_WARN(CAM_CRM, "invalid link state:%d", link->state);

		rc = -EPERM;

		spin_unlock_bh(&link->link_state_spin_lock);

		goto end;

	}

	spin_unlock_bh(&link->link_state_spin_lock);



	/* Validate if req id is present in input queue */

	idx = __cam_req_mgr_find_slot_for_req(link->req.in_q, add_req->req_id);

	if (idx < 0) {