diff options
author | Alexey Starikovskiy <alexey.y.starikovskiy@intel.com> | 2007-02-02 11:48:19 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-02-02 21:14:22 -0500 |
commit | ad71860a17ba33eb0e673e9e2cf5ba0d8e3e3fdd (patch) | |
tree | 9f60547a2e8782c04d7cd1c41bc874047008458c /drivers/acpi/asus_acpi.c | |
parent | a4bbb810dedaecf74d54b16b6dd3c33e95e1024c (diff) |
ACPICA: minimal patch to integrate new tables into Linux
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/asus_acpi.c')
-rw-r--r-- | drivers/acpi/asus_acpi.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c index 396140bbbe57..31ad70a6e22e 100644 --- a/drivers/acpi/asus_acpi.c +++ b/drivers/acpi/asus_acpi.c | |||
@@ -26,7 +26,7 @@ | |||
26 | * Pontus Fuchs - Helper functions, cleanup | 26 | * Pontus Fuchs - Helper functions, cleanup |
27 | * Johann Wiesner - Small compile fixes | 27 | * Johann Wiesner - Small compile fixes |
28 | * John Belmonte - ACPI code for Toshiba laptop was a good starting point. | 28 | * John Belmonte - ACPI code for Toshiba laptop was a good starting point. |
29 | * Éric Burghard - LED display support for W1N | 29 | * �ic Burghard - LED display support for W1N |
30 | * | 30 | * |
31 | */ | 31 | */ |
32 | 32 | ||
@@ -1128,7 +1128,6 @@ static int asus_model_match(char *model) | |||
1128 | static int asus_hotk_get_info(void) | 1128 | static int asus_hotk_get_info(void) |
1129 | { | 1129 | { |
1130 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; | 1130 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; |
1131 | struct acpi_buffer dsdt = { ACPI_ALLOCATE_BUFFER, NULL }; | ||
1132 | union acpi_object *model = NULL; | 1131 | union acpi_object *model = NULL; |
1133 | int bsts_result; | 1132 | int bsts_result; |
1134 | char *string = NULL; | 1133 | char *string = NULL; |
@@ -1142,11 +1141,9 @@ static int asus_hotk_get_info(void) | |||
1142 | * HID), this bit will be moved. A global variable asus_info contains | 1141 | * HID), this bit will be moved. A global variable asus_info contains |
1143 | * the DSDT header. | 1142 | * the DSDT header. |
1144 | */ | 1143 | */ |
1145 | status = acpi_get_table(ACPI_TABLE_ID_DSDT, 1, &dsdt); | 1144 | status = acpi_get_table(ACPI_SIG_DSDT, 1, &asus_info); |
1146 | if (ACPI_FAILURE(status)) | 1145 | if (ACPI_FAILURE(status)) |
1147 | printk(KERN_WARNING " Couldn't get the DSDT table header\n"); | 1146 | printk(KERN_WARNING " Couldn't get the DSDT table header\n"); |
1148 | else | ||
1149 | asus_info = dsdt.pointer; | ||
1150 | 1147 | ||
1151 | /* We have to write 0 on init this far for all ASUS models */ | 1148 | /* We have to write 0 on init this far for all ASUS models */ |
1152 | if (!write_acpi_int(hotk->handle, "INIT", 0, &buffer)) { | 1149 | if (!write_acpi_int(hotk->handle, "INIT", 0, &buffer)) { |
@@ -1358,8 +1355,6 @@ static void __exit asus_acpi_exit(void) | |||
1358 | acpi_bus_unregister_driver(&asus_hotk_driver); | 1355 | acpi_bus_unregister_driver(&asus_hotk_driver); |
1359 | remove_proc_entry(PROC_ASUS, acpi_root_dir); | 1356 | remove_proc_entry(PROC_ASUS, acpi_root_dir); |
1360 | 1357 | ||
1361 | kfree(asus_info); | ||
1362 | |||
1363 | return; | 1358 | return; |
1364 | } | 1359 | } |
1365 | 1360 | ||