From: Lv Zheng <lv.zheng@intel.com>
Date: Thu, 31 Oct 2013 01:30:42 +0000 (+0800)
Subject: ACPICA: Fix an ACPI_ALLOCATE_ZEROED() reversal.
X-Git-Tag: v3.13-rc1~96^2~9^2~7
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bd48d677670bb35548718a1fd54c2c114a449973;p=~emulex%2Finfiniband.git

ACPICA: Fix an ACPI_ALLOCATE_ZEROED() reversal.

ACPI_FREE() should always be used to free objects allocated with
ACPI_ALLOCATE_ZEROED(), so make acpi_ut_create_package_object() do
that.

This patch ports a fix from ACPICA upstream to Linux and helps to
reduce source code differences between them.

[rjw: Changelog]
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c
index cddb0ef5b9b..d2a7b612374 100644
--- a/drivers/acpi/acpica/utobject.c
+++ b/drivers/acpi/acpica/utobject.c
@@ -180,7 +180,7 @@ union acpi_operand_object *acpi_ut_create_package_object(u32 count)
 	package_elements = ACPI_ALLOCATE_ZEROED(((acpi_size) count +
 						 1) * sizeof(void *));
 	if (!package_elements) {
-		acpi_ut_remove_reference(package_desc);
+		ACPI_FREE(package_desc);
 		return_PTR(NULL);
 	}