diff options
author | ChromeOS Developer <dparker@chromium.org> | 2014-02-11 16:42:34 -0800 |
---|---|---|
committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-02-12 20:02:28 +0000 |
commit | f95a1b6b75163c56b34d9eb93c61b8e532a1f154 (patch) | |
tree | 5b7b6524ef4e9e4832af7c9bad002d63ce65c0cd | |
parent | 70faf7b5577d5d908a02058e5c4ab6a2fa9f5fdb (diff) | |
download | chrome-ec-f95a1b6b75163c56b34d9eb93c61b8e532a1f154.tar.gz |
Reapply "CHERRY-PICK: Fix bug with hibernate delay when running off battery"
This reverts commit c28f7336668b033a08dafc394795fba289a78e9a.
BUG=chrome-os-partner:25661
BRANCH=None
TEST=build BOARD=wolf -j
Change-Id: I2edeb5029fc1c0bf4ea8d76f75b896a161fd8d8e
Signed-off-by: Dave Parker <dparker@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/186015
-rw-r--r-- | common/chipset_x86_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/chipset_x86_common.c b/common/chipset_x86_common.c index 63fecfdda9..2704dd143c 100644 --- a/common/chipset_x86_common.c +++ b/common/chipset_x86_common.c @@ -122,7 +122,7 @@ int x86_wait_signals(uint32_t want) void x86_set_state(enum x86_state new_state) { /* Record the time we go into G3 */ - if (state == X86_G3) + if (new_state == X86_G3) last_shutdown_time = get_time().val; state = new_state; |