diff options
Diffstat (limited to 'drivers/acpi/ec.c')
-rw-r--r-- | drivers/acpi/ec.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index cbdf031f3c09..743ce27fa0bb 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
@@ -872,9 +872,8 @@ static int __init acpi_ec_get_real_ecdt(void) | |||
872 | acpi_status status; | 872 | acpi_status status; |
873 | struct acpi_table_ecdt *ecdt_ptr; | 873 | struct acpi_table_ecdt *ecdt_ptr; |
874 | 874 | ||
875 | status = acpi_get_firmware_table("ECDT", 1, ACPI_LOGICAL_ADDRESSING, | 875 | status = acpi_get_table(ACPI_SIG_ECDT, 1, |
876 | (struct acpi_table_header **) | 876 | (struct acpi_table_header **)&ecdt_ptr); |
877 | &ecdt_ptr); | ||
878 | if (ACPI_FAILURE(status)) | 877 | if (ACPI_FAILURE(status)) |
879 | return -ENODEV; | 878 | return -ENODEV; |
880 | 879 | ||
@@ -891,14 +890,14 @@ static int __init acpi_ec_get_real_ecdt(void) | |||
891 | if (acpi_ec_mode == EC_INTR) { | 890 | if (acpi_ec_mode == EC_INTR) { |
892 | init_waitqueue_head(&ec_ecdt->wait); | 891 | init_waitqueue_head(&ec_ecdt->wait); |
893 | } | 892 | } |
894 | ec_ecdt->command_addr = ecdt_ptr->ec_control.address; | 893 | ec_ecdt->command_addr = ecdt_ptr->control.address; |
895 | ec_ecdt->data_addr = ecdt_ptr->ec_data.address; | 894 | ec_ecdt->data_addr = ecdt_ptr->data.address; |
896 | ec_ecdt->gpe = ecdt_ptr->gpe_bit; | 895 | ec_ecdt->gpe = ecdt_ptr->gpe; |
897 | /* use the GL just to be safe */ | 896 | /* use the GL just to be safe */ |
898 | ec_ecdt->global_lock = TRUE; | 897 | ec_ecdt->global_lock = TRUE; |
899 | ec_ecdt->uid = ecdt_ptr->uid; | 898 | ec_ecdt->uid = ecdt_ptr->uid; |
900 | 899 | ||
901 | status = acpi_get_handle(NULL, ecdt_ptr->ec_id, &ec_ecdt->handle); | 900 | status = acpi_get_handle(NULL, ecdt_ptr->id, &ec_ecdt->handle); |
902 | if (ACPI_FAILURE(status)) { | 901 | if (ACPI_FAILURE(status)) { |
903 | goto error; | 902 | goto error; |
904 | } | 903 | } |