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

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

Merge "Revert "msm: ipa3: Fix PM client state check during deactivation""

parents 7d530194 a7af633d

drivers/platform/msm/ipa/ipa_v3/ipa_pm.c

+3 −4
Original line number Diff line number Diff line
@@ -1029,10 +1029,9 @@ int ipa_pm_deactivate_all_deferred(void) 
			IPA_PM_DBG_STATE(client->hdl, client->name,

				client->state);

			spin_unlock_irqrestore(&client->state_lock, flags);

		} else if ((client->state ==

			IPA_PM_ACTIVATED_PENDING_DEACTIVATION) ||

			(client->state ==

			IPA_PM_ACTIVATED_PENDING_RESCHEDULE)) {

		} else if (client->state ==

			IPA_PM_ACTIVATED_PENDING_DEACTIVATION ||

			IPA_PM_ACTIVATED_PENDING_RESCHEDULE) {

			run_algorithm = true;

			client->state = IPA_PM_DEACTIVATED;

			IPA_PM_DBG_STATE(client->hdl, client->name,