Commit 92c6dc59 authored by Thomas Hood's avatar Thomas Hood Committed by Linus Torvalds

[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: default avatarThomas Hood <jdthood@yahoo.co.uk>
Acked-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 223230e7
...@@ -1222,6 +1222,7 @@ static int suspend(int vetoable) ...@@ -1222,6 +1222,7 @@ static int suspend(int vetoable)
save_processor_state(); save_processor_state();
err = set_system_power_state(APM_STATE_SUSPEND); err = set_system_power_state(APM_STATE_SUSPEND);
ignore_normal_resume = 1;
restore_processor_state(); restore_processor_state();
local_irq_disable(); local_irq_disable();
...@@ -1229,7 +1230,6 @@ static int suspend(int vetoable) ...@@ -1229,7 +1230,6 @@ static int suspend(int vetoable)
spin_lock(&i8253_lock); spin_lock(&i8253_lock);
reinit_timer(); reinit_timer();
set_time(); set_time();
ignore_normal_resume = 1;
spin_unlock(&i8253_lock); spin_unlock(&i8253_lock);
write_sequnlock(&xtime_lock); write_sequnlock(&xtime_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment