Merge branch 'acpi-assorted'

* acpi-assorted:
  ACPI: Add Toshiba NB100 to Vista _OSI blacklist
  ACPI / osl: remove an unneeded NULL check
  ACPI / platform: add ACPI ID for a Broadcom GPS chip
  ACPI: improve acpi_extract_package() utility
  ACPI / LPSS: fix UART Auto Flow Control
  ACPI / platform: Add ACPI IDs for Intel SST audio device
  x86 / ACPI: fix incorrect placement of __initdata tag
  ACPI / thermal: convert printk(LEVEL...) to pr_<lvl>
  ACPI / sysfs: make GPE sysfs attributes only accept correct values
  ACPI / EC: Convert all printk() calls to dynamic debug function
  ACPI / button: Using input_set_capability() to mark device's event capability
  ACPI / osl: implement acpi_os_sleep() with msleep()

1 files changed, 13 insertions, 4 deletions

diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 552248b0005b..fc2cd3284080 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -169,11 +169,20 @@ acpi_extract_package(union acpi_object *package,
         /*
          * Validate output buffer.
          */
-        if (buffer->length < size_required) {
+        if (buffer->length == ACPI_ALLOCATE_BUFFER) {
+                buffer->pointer = ACPI_ALLOCATE(size_required);
+                if (!buffer->pointer)
+                        return AE_NO_MEMORY;
                 buffer->length = size_required;
-                return AE_BUFFER_OVERFLOW;
-        } else if (buffer->length != size_required || !buffer->pointer) {
-                return AE_BAD_PARAMETER;
+                memset(buffer->pointer, 0, size_required);
+        } else {
+                if (buffer->length < size_required) {
+                        buffer->length = size_required;
+                        return AE_BUFFER_OVERFLOW;
+                } else if (buffer->length != size_required ||
+                           !buffer->pointer) {
+                        return AE_BAD_PARAMETER;
+                }
         }
 
         head = buffer->pointer;