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

Commit f0a4ec7d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: rpmh: disallow active state requests in solver mode." into msm-4.14

parents 913a0c88 8eaad030

drivers/soc/qcom/rpmh.c

+2 −1
Original line number Diff line number Diff line
@@ -285,7 +285,8 @@ static int check_ctrlr_state(struct rpmh_client *rc, enum rpmh_state state) 


	/* Do not allow setting active votes when in solver mode */

	spin_lock_irqsave(&rpm->lock, flags);

	if (rpm->in_solver_mode && state == RPMH_AWAKE_STATE)

	if (rpm->in_solver_mode &&

	    (state == RPMH_AWAKE_STATE || state == RPMH_ACTIVE_ONLY_STATE))

		ret = -EBUSY;

	spin_unlock_irqrestore(&rpm->lock, flags);