Re: APM suspend/resume ceased to work with 2.4.28

[Philippe Troin <phil@fifi.org>]

[-- Attachment #1: Type: text/plain, Size: 617 bytes --]

Philippe Troin <phil@fifi.org> writes:

> Where do we go from here?

I just diffed out the boot log between 2.4.27 and 2.4.28.  And I found
this new message appearing in 2.4.28:

        ACPI: IRQ9 SCI: Edge set to Level Trigger.

Weird since IRQ 9 is not in use in this system.  IRQ9 is typically
used by ACPI.

After some digging in the sources, I found that the newly introduced
(2.4.28-rc2) function acpi_early_init() runs wether or not acpi=off
was specified on the command line.

This trivial patch makes my laptop suspend-happy.  Len, please confirm
that this is ok.  Marcelo, please include in 29-pre.

Phil.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: linux-2.4.28-8-acpi.patch --]
[-- Type: text/x-patch, Size: 440 bytes --]

diff -ruN linux-2.4.28.orig/drivers/acpi/bus.c linux-2.4.28/drivers/acpi/bus.c
--- linux-2.4.28.orig/drivers/acpi/bus.c	Wed Nov 17 03:54:21 2004
+++ linux-2.4.28/drivers/acpi/bus.c	Thu Dec  2 16:49:54 2004
@@ -1850,6 +1850,9 @@
 	acpi_status		status = AE_OK;
 	struct acpi_buffer	buffer = {sizeof(acpi_fadt), &acpi_fadt};
 
+	if (acpi_disabled)
+		return;
+
 	ACPI_FUNCTION_TRACE("acpi_bus_init");
 
 	status = acpi_initialize_subsystem();