summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchasewu <chasewu@google.com>2021-09-30 09:09:27 +0800
committerChase Wu <chasewu@google.com>2021-09-30 06:30:36 +0000
commit17d6627ee33948a121eed5c98347eca7f711b54e (patch)
tree28b42df9e5f91d5550aaed4323241cb1ea1ffbb8
parent5d5df134c9808c5471f5e53f51aa96709ba2b57d (diff)
downloadamplifiers-17d6627ee33948a121eed5c98347eca7f711b54e.tar.gz
cs40l25: Clear vibe_state when A2H is still active
Both the vibe_state and wake lock are gated on haptics effects and not on A2H so should be cleared regardless of if A2H is still active. Bug: 200067948 Test: request QMC to do the fundamental test Change-Id: Id128c795d2c0a8c4ee55c6ec78aadd40fc503e25 Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: chasewu <chasewu@google.com>
-rw-r--r--cs40l25/cs40l2x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cs40l25/cs40l2x.c b/cs40l25/cs40l2x.c
index 7751023..1c65044 100644
--- a/cs40l25/cs40l2x.c
+++ b/cs40l25/cs40l2x.c
@@ -6807,9 +6807,9 @@ static void cs40l2x_vibe_mode_worker(struct work_struct *work)
dev_err(dev, "Failed to ground amplifier outputs\n");
goto err_exit;
}
- cs40l2x_set_state(cs40l2x, CS40L2X_VIBE_STATE_STOPPED);
- cs40l2x_wl_relax(cs40l2x);
}
+ cs40l2x_set_state(cs40l2x, CS40L2X_VIBE_STATE_STOPPED);
+ cs40l2x_wl_relax(cs40l2x);
if (cs40l2x->dyn_f0_enable) {
ret = cs40l2x_read_dyn_f0_table(cs40l2x);