diff options
| author | Andres Salomon <dilinger@debian.org> | 2008-08-26 19:16:13 -0400 |
|---|---|---|
| committer | Andres Salomon <dilinger@debian.org> | 2008-08-26 19:16:13 -0400 |
| commit | 7bee90029d84945533fa232f7241f256169df456 (patch) | |
| tree | 3fb5cc086bde998d4bb1bec45126d6b31de4f3c0 | |
| parent | cc866cfe0c31220bd03a44e6c5d9e86decd63aaa (diff) | |
| download | lwn-7bee90029d84945533fa232f7241f256169df456.tar.gz lwn-7bee90029d84945533fa232f7241f256169df456.zip | |
OLPC: pm: don't mess with EC mask during suspend759
a) OHM handles this
b) we weren't resetting stuff on resume, which meant the mask was
incorrect. see #8010.
Signed-off-by: Andres Salomon <dilinger@debian.org>
| -rw-r--r-- | arch/x86/kernel/olpc-pm.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/olpc-pm.c b/arch/x86/kernel/olpc-pm.c index aff66aa53bcb..acedefbba498 100644 --- a/arch/x86/kernel/olpc-pm.c +++ b/arch/x86/kernel/olpc-pm.c @@ -424,9 +424,6 @@ int olpc_fixup_sleep(void) gpio_wake_events &= ~(GPIO_WAKEUP_LID); } - /* We don't want to wake up on superfluous events */ - olpc_ec_mask_unset(EC_SCI_SRC_BATSOC | EC_SCI_SRC_ACPWR); - /* * Cmd 0x32 tells the EC that we're going into suspend; this was * added to work around hardware races related to SCI events. This |