diff options
author | Lv Zheng <lv.zheng@intel.com> | 2013-10-30 21:30:42 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-31 09:37:33 -0400 |
commit | bd48d677670bb35548718a1fd54c2c114a449973 (patch) | |
tree | e653428c9ef84d9f63531a79a55e8ac18ff30e43 /drivers/acpi/acpica | |
parent | 130797a6c3f1421c10880a1681d6a9c57b80ef17 (diff) |
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>
Diffstat (limited to 'drivers/acpi/acpica')
-rw-r--r-- | drivers/acpi/acpica/utobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c index cddb0ef5b9b7..d2a7b6123743 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) | |||
180 | package_elements = ACPI_ALLOCATE_ZEROED(((acpi_size) count + | 180 | package_elements = ACPI_ALLOCATE_ZEROED(((acpi_size) count + |
181 | 1) * sizeof(void *)); | 181 | 1) * sizeof(void *)); |
182 | if (!package_elements) { | 182 | if (!package_elements) { |
183 | acpi_ut_remove_reference(package_desc); | 183 | ACPI_FREE(package_desc); |
184 | return_PTR(NULL); | 184 | return_PTR(NULL); |
185 | } | 185 | } |
186 | 186 | ||