diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2015-05-01 10:45:48 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-05-12 02:50:16 +0000 |
| commit | 3a36c29e6756231f2fb1fdd26447d519cbd5b26a (patch) | |
| tree | 755259729196337d469bfef0d0a4ff16fc809276 /power | |
| parent | a394302e4aef0349c30cbccf6b4623bcb3dda5bf (diff) | |
| download | chrome-ec-3a36c29e6756231f2fb1fdd26447d519cbd5b26a.tar.gz | |
glados: Initial mainboard commitstabilize-7060.B
BUG=chrome-os-partner:39510
TEST=Compile Only
BRANCH=None
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Change-Id: If470b00fec56db0884dbd4c9974140951fc214fd
Reviewed-on: https://chromium-review.googlesource.com/268780
Reviewed-by: Alec Berg <alecaberg@chromium.org>
Diffstat (limited to 'power')
| -rw-r--r-- | power/skylake.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/power/skylake.c b/power/skylake.c index 1dce1fde4f..202dce628f 100644 --- a/power/skylake.c +++ b/power/skylake.c @@ -231,7 +231,7 @@ enum power_state power_handle_state(enum power_state state) gpio_set_level(GPIO_ENABLE_TOUCHPAD, 0); - return power_get_pause_in_s5() ? POWER_S5 : POWER_S5G3; + return POWER_S5G3; case POWER_S5G3: gpio_set_level(GPIO_PCH_RSMRST_L, 0); |