# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1101 -> 1.1102
# drivers/acpi/events/evregion.c 1.17 -> 1.18
# drivers/acpi/ec.c 1.12 -> 1.13
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/09/08 len.brown@intel.com 1.1102
# Fix ACPI oops on ThinkPad T32/T40 (Shaohua David Li)
# --------------------------------------------
#
diff -Nru a/drivers/acpi/ec.c b/drivers/acpi/ec.c
--- a/drivers/acpi/ec.c Tue Sep 23 12:11:04 2003
+++ b/drivers/acpi/ec.c Tue Sep 23 12:11:04 2003
@@ -33,7 +33,7 @@
#include <asm/io.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
-
+#include <acpi/actypes.h>
#define _COMPONENT ACPI_EC_COMPONENT
ACPI_MODULE_NAME ("acpi_ec")
@@ -408,7 +408,10 @@
* The EC object is in the handler context and is needed
* when calling the acpi_ec_space_handler.
*/
- *return_context = handler_context;
+ if(function == ACPI_REGION_DEACTIVATE)
+ *return_context = NULL;
+ else
+ *return_context = handler_context;
return AE_OK;
}
diff -Nru a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c
--- a/drivers/acpi/events/evregion.c Tue Sep 23 12:11:04 2003
+++ b/drivers/acpi/events/evregion.c Tue Sep 23 12:11:04 2003
@@ -382,7 +382,7 @@
union acpi_operand_object *obj_desc;
union acpi_operand_object **last_obj_ptr;
acpi_adr_space_setup region_setup;
- void *region_context;
+ void **region_context;
union acpi_operand_object *region_obj2;
acpi_status status;
@@ -394,7 +394,7 @@
if (!region_obj2) {
return_VOID;
}
- region_context = region_obj2->extra.region_context;
+ region_context = ®ion_obj2->extra.region_context;
/* Get the address handler from the region object */
@@ -450,7 +450,7 @@
region_setup = handler_obj->address_space.setup;
status = region_setup (region_obj, ACPI_REGION_DEACTIVATE,
- handler_obj->address_space.context, ®ion_context);
+ handler_obj->address_space.context, region_context);
/* Init routine may fail, Just ignore errors */