git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
acpi
/
ec.c
diff --git
a/drivers/acpi/ec.c
b/drivers/acpi/ec.c
index
d1d509f
..
d141914
100644
(file)
--- a/
drivers/acpi/ec.c
+++ b/
drivers/acpi/ec.c
@@
-381,7
+381,7
@@
end:
acpi_enable_gpe(NULL, ec->gpe_bit, ACPI_NOT_ISR);
}
acpi_enable_gpe(NULL, ec->gpe_bit, ACPI_NOT_ISR);
}
-static
void
+static
u32
acpi_ec_gpe_handler (
void *data)
{
acpi_ec_gpe_handler (
void *data)
{
@@
-389,12
+389,17
@@
acpi_ec_gpe_handler (
struct acpi_ec *ec = (struct acpi_ec *) data;
if (!ec)
struct acpi_ec *ec = (struct acpi_ec *) data;
if (!ec)
- return;
+ return
ACPI_INTERRUPT_NOT_HANDLED
;
acpi_disable_gpe(NULL, ec->gpe_bit, ACPI_ISR);
status = acpi_os_queue_for_execution(OSD_PRIORITY_GPE,
acpi_ec_gpe_query, ec);
acpi_disable_gpe(NULL, ec->gpe_bit, ACPI_ISR);
status = acpi_os_queue_for_execution(OSD_PRIORITY_GPE,
acpi_ec_gpe_query, ec);
+
+ if (status == AE_OK)
+ return ACPI_INTERRUPT_HANDLED;
+ else
+ return ACPI_INTERRUPT_NOT_HANDLED;
}
/* --------------------------------------------------------------------------
}
/* --------------------------------------------------------------------------
@@
-548,6
+553,12
@@
acpi_ec_remove_fs (
{
ACPI_FUNCTION_TRACE("acpi_ec_remove_fs");
{
ACPI_FUNCTION_TRACE("acpi_ec_remove_fs");
+ if (acpi_device_dir(device)) {
+ remove_proc_entry(ACPI_EC_FILE_INFO, acpi_device_dir(device));
+ remove_proc_entry(acpi_device_bid(device), acpi_ec_dir);
+ acpi_device_dir(device) = NULL;
+ }
+
return_VALUE(0);
}
return_VALUE(0);
}
@@
-723,6
+734,8
@@
acpi_ec_start (
if (ACPI_FAILURE(status)) {
return_VALUE(-ENODEV);
}
if (ACPI_FAILURE(status)) {
return_VALUE(-ENODEV);
}
+ acpi_set_gpe_type (NULL, ec->gpe_bit, ACPI_GPE_TYPE_RUNTIME);
+ acpi_enable_gpe (NULL, ec->gpe_bit, ACPI_NOT_ISR);
status = acpi_install_address_space_handler (ec->handle,
ACPI_ADR_SPACE_EC, &acpi_ec_space_handler,
status = acpi_install_address_space_handler (ec->handle,
ACPI_ADR_SPACE_EC, &acpi_ec_space_handler,
@@
-808,6
+821,8
@@
acpi_ec_ecdt_probe (void)
if (ACPI_FAILURE(status)) {
goto error;
}
if (ACPI_FAILURE(status)) {
goto error;
}
+ acpi_set_gpe_type (NULL, ec_ecdt->gpe_bit, ACPI_GPE_TYPE_RUNTIME);
+ acpi_enable_gpe (NULL, ec_ecdt->gpe_bit, ACPI_NOT_ISR);
status = acpi_install_address_space_handler (ACPI_ROOT_OBJECT,
ACPI_ADR_SPACE_EC, &acpi_ec_space_handler,
status = acpi_install_address_space_handler (ACPI_ROOT_OBJECT,
ACPI_ADR_SPACE_EC, &acpi_ec_space_handler,