Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / drivers / acpi / utils.c

diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 0f5f78fa6545cf4d30da8f56b426033ac7f7132e..bba526148583c4ea67e0a5d08631d7f0eecbee2a 100644 (file)
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -164,11 +164,10 @@ acpi_extract_package(union acpi_object *package,
         * Validate output buffer.
         */
        if (buffer->length == ACPI_ALLOCATE_BUFFER) {
-               buffer->pointer = ACPI_ALLOCATE(size_required);
+               buffer->pointer = ACPI_ALLOCATE_ZEROED(size_required);
                if (!buffer->pointer)
                        return AE_NO_MEMORY;
                buffer->length = size_required;
-               memset(buffer->pointer, 0, size_required);
        } else {
                if (buffer->length < size_required) {
                        buffer->length = size_required;