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

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

Merge "msm: camera: reqmgr: Change state check in callbacks" into dev/msm-4.9-camx

parents 5b52f25d 13c7d6c7

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

+2 −2
Original line number Diff line number Diff line
@@ -1860,7 +1860,7 @@ static int cam_req_mgr_cb_add_req(struct cam_req_mgr_add_request *add_req) 


	mutex_lock(&link->lock);

	spin_lock_bh(&link->link_state_spin_lock);

	if (link->state != CAM_CRM_LINK_STATE_READY) {

	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);
@@ -1997,7 +1997,7 @@ static int cam_req_mgr_cb_notify_trigger( 
	}



	spin_lock_bh(&link->link_state_spin_lock);

	if (link->state != CAM_CRM_LINK_STATE_READY) {

	if (link->state < CAM_CRM_LINK_STATE_READY) {

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

		spin_unlock_bh(&link->link_state_spin_lock);

		rc = -EPERM;