diff options
| author | Thomas Hood <jdthood@aglu.demon.nl> | 2005-06-13 22:58:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-14 07:19:35 -0700 |
| commit | 92c6dc59b7c1ca514021502c7eef53b9f2c738fd (patch) | |
| tree | 18b82203c75979094e089e4feed1f825fa326c07 /arch | |
| parent | 223230e78900e5f0be984f7697cb9bf172d71a35 (diff) | |
| download | linux-stable-92c6dc59b7c1ca514021502c7eef53b9f2c738fd.tar.gz linux-stable-92c6dc59b7c1ca514021502c7eef53b9f2c738fd.tar.bz2 linux-stable-92c6dc59b7c1ca514021502c7eef53b9f2c738fd.zip | |
[PATCH] apm.c: ignore_normal_resume is set a bit too late
This patch causes the ignore_normal_resume flag to be set slightly earlier,
before there is a chance that the apm driver will receive the normal resume
event from the BIOS. (Addresses Debian bug #310865)
Signed-off-by: Thomas Hood <jdthood@yahoo.co.uk>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/kernel/apm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c index 45641a872550..0ff65abcd56c 100644 --- a/arch/i386/kernel/apm.c +++ b/arch/i386/kernel/apm.c @@ -1222,6 +1222,7 @@ static int suspend(int vetoable) save_processor_state(); err = set_system_power_state(APM_STATE_SUSPEND); + ignore_normal_resume = 1; restore_processor_state(); local_irq_disable(); @@ -1229,7 +1230,6 @@ static int suspend(int vetoable) spin_lock(&i8253_lock); reinit_timer(); set_time(); - ignore_normal_resume = 1; spin_unlock(&i8253_lock); write_sequnlock(&xtime_lock); |