diff options
| author | zyw <zyw@rock-chips.com> | 2014-08-28 21:12:07 +0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-08-29 03:00:12 +0000 |
| commit | 866af4f6f275266850be9dd3fd8ee0aae085b8d1 (patch) | |
| tree | 3213f8ed230952c3a6adf175646fd32923c33838 | |
| parent | 1b358e2c934c119f96bd435a3f4f12a272142400 (diff) | |
| download | chrome-ec-866af4f6f275266850be9dd3fd8ee0aae085b8d1.tar.gz | |
Veyron: Add a time_cancel in power button release
A cancel is needed when power button is release before timeout
BUG=None
TEST=When in S3/S0, hold the power button for 8 seconds; the system should shutdown.
And release button before that, It's normal.
BRANCH=None
Change-Id: I1baf3a80d7b6349d2e10eb1f7ea9795ee73fb487
Signed-off-by: zyw <zyw@rock-chips.com>
Reviewed-on: https://chromium-review.googlesource.com/214750
Reviewed-by: Alexandru Stan <amstan@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Queue: Alexandru Stan <amstan@chromium.org>
Tested-by: Alexandru Stan <amstan@chromium.org>
| -rw-r--r-- | power/rockchip.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/power/rockchip.c b/power/rockchip.c index 4075f8b570..a3a5492a66 100644 --- a/power/rockchip.c +++ b/power/rockchip.c @@ -184,6 +184,7 @@ static int check_for_power_off_event(void) } else if (power_button_was_pressed) { CPRINTS("power off cancel"); set_pmic_pwren(0); + timer_cancel(TASK_ID_CHIPSET); } power_button_was_pressed = pressed; |