AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

acer-wmi: support integer return type from WMI methods

Browse Source 
Acer WMID_GUID1/2 method's return value was declared to integer
type on Gateway notebook.
So, add this patch for support integer return type.

Reference: bko#33032
	https://bugzilla.kernel.org/show_bug.cgi?id=33032

Tested on Gateway NV5909H laptop

Tested-by: Filipus Klutiero <chealer@gmail.com>
Cc: Carlos Corbacho <carlos@strangeworlds.co.uk>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Dmitry Torokhov <dtor@mail.ru>
Cc: Corentin Chary <corentincj@iksaif.net>
Cc: Thomas Renninger <trenn@suse.de>
Signed-off-by: Lee, Chun-Yi <jlee@novell.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
Lee, Chun-Yi 2011-05-27 14:52:14 +08:00 committed by Matthew Garrett
parent d436514e21
commit 987dfbaa65
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/platform/x86/acer-wmi.c
View File

@ -754,6 +754,8 @@ WMI_execute_u32(u32 method_id, u32 in, u32 *out)
(obj->buffer.length == sizeof(u32) || (obj->buffer.length == sizeof(u32) ||
obj->buffer.length == sizeof(u64))) { obj->buffer.length == sizeof(u64))) {
tmp = *((u32 *) obj->buffer.pointer); tmp = *((u32 *) obj->buffer.pointer);
} else if (obj->type == ACPI_TYPE_INTEGER) {
tmp = (u32) obj->integer.value;
} else { } else {
tmp = 0; tmp = 0;
} }
@ -884,6 +886,8 @@ static acpi_status WMID_set_capabilities(void)
(obj->buffer.length == sizeof(u32) || (obj->buffer.length == sizeof(u32) ||
obj->buffer.length == sizeof(u64))) { obj->buffer.length == sizeof(u64))) {
devices = *((u32 *) obj->buffer.pointer); devices = *((u32 *) obj->buffer.pointer);
} else if (obj->type == ACPI_TYPE_INTEGER) {
devices = (u32) obj->integer.value;
} else { } else {
kfree(out.pointer); kfree(out.pointer);
return AE_ERROR; return AE_ERROR;
@ -1636,6 +1640,8 @@ static u32 get_wmid_devices(void)
(obj->buffer.length == sizeof(u32) || (obj->buffer.length == sizeof(u32) ||
obj->buffer.length == sizeof(u64))) { obj->buffer.length == sizeof(u64))) {
devices = *((u32 *) obj->buffer.pointer); devices = *((u32 *) obj->buffer.pointer);
} else if (obj->type == ACPI_TYPE_INTEGER) {
devices = (u32) obj->integer.value;
} }
kfree(out.pointer); kfree(out.pointer);