lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ACPI: EC: Add some basic check for ECDT data

Browse Source 
One more ASUS comes with empty ECDT, add a guard for it...

http://bugzilla.kernel.org/show_bug.cgi?id=11880

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Alexey Starikovskiy
2008-11-26 17:11:53 -05:00
committed by Len Brown
parent ed313489ba
commit c5279dee26
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/acpi/ec.c
View File

@@ -977,7 +977,6 @@ static const struct acpi_device_id ec_device_ids[] = {
int __init acpi_ec_ecdt_probe(void) int __init acpi_ec_ecdt_probe(void)
{ {
int ret;
acpi_status status; acpi_status status;
struct acpi_table_ecdt *ecdt_ptr; struct acpi_table_ecdt *ecdt_ptr;
@@ -1005,7 +1004,11 @@ int __init acpi_ec_ecdt_probe(void)
boot_ec->gpe = ecdt_ptr->gpe; boot_ec->gpe = ecdt_ptr->gpe;
boot_ec->handle = ACPI_ROOT_OBJECT; boot_ec->handle = ACPI_ROOT_OBJECT;
acpi_get_handle(ACPI_ROOT_OBJECT, ecdt_ptr->id, &boot_ec->handle); acpi_get_handle(ACPI_ROOT_OBJECT, ecdt_ptr->id, &boot_ec->handle);
} else { /* Add some basic check against completely broken table */
if (boot_ec->data_addr != boot_ec->command_addr)
goto install;
/* fall through */
}
/* This workaround is needed only on some broken machines, /* This workaround is needed only on some broken machines,
* which require early EC, but fail to provide ECDT */ * which require early EC, but fail to provide ECDT */
acpi_handle x; acpi_handle x;
@@ -1021,10 +1024,8 @@ int __init acpi_ec_ecdt_probe(void)
*/ */
if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &x))) if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &x)))
return -ENODEV; return -ENODEV;
} install:
if (!ec_install_handlers(boot_ec)) {
ret = ec_install_handlers(boot_ec);
if (!ret) {
first_ec = boot_ec; first_ec = boot_ec;
return 0; return 0;
} }