summaryrefslogtreecommitdiff
path: root/power
diff options
context:
space:
mode:
authorPhilip Chen <philipchen@google.com>2018-04-20 14:57:58 -0700
committerchrome-bot <chrome-bot@chromium.org>2018-04-20 23:01:33 -0700
commit7db9838df5360232a3e81b1a2c5f163eaef3fba6 (patch)
tree8bc293e87d3e18182a4814099b216346f7366a36 /power
parente09917178de4a3c0cc61f5cbf012a33896fea42e (diff)
downloadchrome-ec-7db9838df5360232a3e81b1a2c5f163eaef3fba6.tar.gz
power/rk3399: Check aborted suspend for s0s3_usb_wake_power_seq
BUG=b:78321971 BRANCH=scarlet TEST=build kevin and scarlet Change-Id: I9e0c842cd8f4186147fa8e6d001b1c21ddad7e89 Signed-off-by: Philip Chen <philipchen@google.com> Reviewed-on: https://chromium-review.googlesource.com/1022746 Commit-Ready: Philip Chen <philipchen@chromium.org> Tested-by: Philip Chen <philipchen@chromium.org> Reviewed-by: Derek Basehore <dbasehore@chromium.org>
Diffstat (limited to 'power')
-rw-r--r--power/rk3399.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/power/rk3399.c b/power/rk3399.c
index 2c8a5e9e96..e70bd3e84f 100644
--- a/power/rk3399.c
+++ b/power/rk3399.c
@@ -303,7 +303,11 @@ static int power_seq_run(const struct power_seq_op *power_seq_ops, int op_count)
power_seq_ops[i].level);
if (!power_seq_ops[i].delay)
continue;
- if (power_seq_ops == s0s3_power_seq)
+ if ((power_seq_ops == s0s3_power_seq)
+#ifdef S3_USB_WAKE
+ || (power_seq_ops == s0s3_usb_wake_power_seq)
+#endif
+ )
MSLEEP_CHECK_ABORTED_SUSPEND(power_seq_ops[i].delay);
else
msleep(power_seq_ops[i].delay);