Skip to content

Commit

Permalink
[PATCH] apm.c: ignore_normal_resume is set a bit too late
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Hood authored and Linus Torvalds committed Jun 14, 2005
1 parent 223230e commit 92c6dc5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/i386/kernel/apm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1222,14 +1222,14 @@ 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();
write_seqlock(&xtime_lock);
spin_lock(&i8253_lock);
reinit_timer();
set_time();
ignore_normal_resume = 1;

spin_unlock(&i8253_lock);
write_sequnlock(&xtime_lock);
Expand Down

0 comments on commit 92c6dc5

Please sign in to comment.