Commit 92c6dc59 authored Jun 13, 2005 by Thomas Hood Committed by Linus Torvalds Jun 14, 2005

[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>

parent 223230e7

arch/i386/kernel/apm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);