commit 0bbf24ae7346c72478c1a27fd326c4c4e9cc3497
author Linux Build Service Account <lnxbuild@quicinc.com> Mon Nov 20 15:34:38 2017 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Nov 20 15:34:37 2017 -0800
tree 10aeaea64792776e2a548bd7f9abb17fc4261138
parent b1886226ac438506e6a171c05593ac0cac78e9ce
parent 1ca92f3d6dcab18c6277b89deafeeb5652d3ec70

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

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

diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_pm.c b/drivers/platform/msm/ipa/ipa_v3/ipa_pm.c
index 3bf0327..fea9b3b 100644
--- a/drivers/platform/msm/ipa/ipa_v3/ipa_pm.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_pm.c
@@ -1029,9 +1029,10 @@
 			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 ||
-			IPA_PM_ACTIVATED_PENDING_RESCHEDULE) {
+		} else if ((client->state ==
+			IPA_PM_ACTIVATED_PENDING_DEACTIVATION) ||
+			(client->state ==
+			IPA_PM_ACTIVATED_PENDING_RESCHEDULE)) {
 			run_algorithm = true;
 			client->state = IPA_PM_DEACTIVATED;
 			IPA_PM_DBG_STATE(client->hdl, client->name,