From bf748f31c68c3c3fa9ef84eb6cd76082f4dd7637 Mon Sep 17 00:00:00 2001 From: "Lee, Chun-Yi" Date: Sun, 22 May 2011 07:33:53 +0800 Subject: [PATCH] --- yaml --- r: 252877 b: refs/heads/master c: ab6a931620cfa5c565b351d1982306c3c8b97f96 h: refs/heads/master i: 252875: 0422d7cbfd03468af83aaa17fed679ad55dc57ad v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/acer-wmi.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e48551934610..8948beaa3e66 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8d1a266eee5f8b822449fe19d1735189377ef47 +refs/heads/master: ab6a931620cfa5c565b351d1982306c3c8b97f96 diff --git a/trunk/drivers/platform/x86/acer-wmi.c b/trunk/drivers/platform/x86/acer-wmi.c index 92ee4d637270..48219117823b 100644 --- a/trunk/drivers/platform/x86/acer-wmi.c +++ b/trunk/drivers/platform/x86/acer-wmi.c @@ -750,7 +750,8 @@ WMI_execute_u32(u32 method_id, u32 in, u32 *out) obj = (union acpi_object *) result.pointer; if (obj && obj->type == ACPI_TYPE_BUFFER && - obj->buffer.length == sizeof(u32)) { + (obj->buffer.length == sizeof(u32) || + obj->buffer.length == sizeof(u64))) { tmp = *((u32 *) obj->buffer.pointer); } else { tmp = 0; @@ -879,7 +880,8 @@ static acpi_status WMID_set_capabilities(void) obj = (union acpi_object *) out.pointer; if (obj && obj->type == ACPI_TYPE_BUFFER && - obj->buffer.length == sizeof(u32)) { + (obj->buffer.length == sizeof(u32) || + obj->buffer.length == sizeof(u64))) { devices = *((u32 *) obj->buffer.pointer); } else { kfree(out.pointer); @@ -1522,7 +1524,8 @@ static u32 get_wmid_devices(void) obj = (union acpi_object *) out.pointer; if (obj && obj->type == ACPI_TYPE_BUFFER && - obj->buffer.length == sizeof(u32)) { + (obj->buffer.length == sizeof(u32) || + obj->buffer.length == sizeof(u64))) { devices = *((u32 *) obj->buffer.pointer); }