From 14db994e16c1a7db9eba104aaf68014997cd1189 Mon Sep 17 00:00:00 2001 From: Lina Iyer Date: Wed, 29 Jul 2020 21:16:36 -0700 Subject: [PATCH] Revert "soc: qcom: rpmh: Dirt can only make you dirtier, not cleaner" This reverts commit 4f80cb2c787f09772e73f9d5df4dc18354920b70. This is a preparation change for merging android-5.4.54 into msm-5.4 branch. Revert this change to continue using existing driver that is already supporting same functionality being added in this change. Change-Id: I783632301c9923c766a35e0341b56469a8daed35 Signed-off-by: Blagovest Kolenichev --- drivers/soc/qcom/rpmh.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/soc/qcom/rpmh.c b/drivers/soc/qcom/rpmh.c index 13e1b450f296..ae2d1590a611 100644 --- a/drivers/soc/qcom/rpmh.c +++ b/drivers/soc/qcom/rpmh.c @@ -150,10 +150,10 @@ existing: break; } - ctrlr->dirty |= (req->sleep_val != old_sleep_val || - req->wake_val != old_wake_val) && - req->sleep_val != UINT_MAX && - req->wake_val != UINT_MAX; + ctrlr->dirty = (req->sleep_val != old_sleep_val || + req->wake_val != old_wake_val) && + req->sleep_val != UINT_MAX && + req->wake_val != UINT_MAX; unlock: spin_unlock_irqrestore(&ctrlr->cache_lock, flags);