diff options
author | Zhang Rui <rui.zhang@intel.com> | 2014-10-17 10:30:58 +0400 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2014-10-17 10:30:58 +0400 |
commit | 6ceaf58abe25e86292152005c51169796bad3407 (patch) | |
tree | e97a032bc9dc63da9939136bd32ed5e0ad0f09bc /drivers/acpi/utils.c | |
parent | 9ceaa81efd1dd5ec83cf6be5a9445809583a03b6 (diff) | |
parent | d8054749c6795073cb427465a726213d45898f68 (diff) | |
download | linux-6ceaf58abe25e86292152005c51169796bad3407.tar.xz |
Merge branch 'int340x-thermal' of .git into next
Diffstat (limited to 'drivers/acpi/utils.c')
-rw-r--r-- | drivers/acpi/utils.c | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index 07c8c5a5ee95..1ed7aba99d8d 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c @@ -149,6 +149,21 @@ acpi_extract_package(union acpi_object *package, break; } break; + case ACPI_TYPE_LOCAL_REFERENCE: + switch (format_string[i]) { + case 'R': + size_required += sizeof(void *); + tail_offset += sizeof(void *); + break; + default: + printk(KERN_WARNING PREFIX "Invalid package element" + " [%d] got reference," + " expecting [%c]\n", + i, format_string[i]); + return AE_BAD_DATA; + break; + } + break; case ACPI_TYPE_PACKAGE: default: @@ -247,7 +262,18 @@ acpi_extract_package(union acpi_object *package, break; } break; - + case ACPI_TYPE_LOCAL_REFERENCE: + switch (format_string[i]) { + case 'R': + *(void **)head = + (void *)element->reference.handle; + head += sizeof(void *); + break; + default: + /* Should never get here */ + break; + } + break; case ACPI_TYPE_PACKAGE: /* TBD: handle nested packages... */ default: |