aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/utobject.c
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2015-12-29 00:52:32 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-12-31 21:26:44 -0500
commit5431b6543fb45f6c61dbb1394c918f3bc5acefae (patch)
treef650faee3089b7860f203f96ea3cc61b1a19c49d /drivers/acpi/acpica/utobject.c
parentb17629dbf72d0718e88190d7f0a1d54be044799c (diff)
ACPICA: Linuxize: reduce divergences for 20151218 release
The patch reduces source code differences between the Linux kernel and the ACPICA upstream so that the linuxized ACPICA 20151218 release can be applied with reduced human intervention. The pscode.c has already been out of sync for months, and it becomes more and more difficult to merge pscode.c changes, so instead of update the affected lines of pscode.c, this patch synchronizes entire pscode.c file. 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/utobject.c')
-rw-r--r--drivers/acpi/acpica/utobject.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c
index 7d83efe1ea29..c7e11ccb09ba 100644
--- a/drivers/acpi/acpica/utobject.c
+++ b/drivers/acpi/acpica/utobject.c
@@ -253,7 +253,7 @@ union acpi_operand_object *acpi_ut_create_buffer_object(acpi_size buffer_size)
253 buffer = ACPI_ALLOCATE_ZEROED(buffer_size); 253 buffer = ACPI_ALLOCATE_ZEROED(buffer_size);
254 if (!buffer) { 254 if (!buffer) {
255 ACPI_ERROR((AE_INFO, "Could not allocate size %u", 255 ACPI_ERROR((AE_INFO, "Could not allocate size %u",
256 (u32) buffer_size)); 256 (u32)buffer_size));
257 acpi_ut_remove_reference(buffer_desc); 257 acpi_ut_remove_reference(buffer_desc);
258 return_PTR(NULL); 258 return_PTR(NULL);
259 } 259 }
@@ -305,7 +305,7 @@ union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size)
305 string = ACPI_ALLOCATE_ZEROED(string_size + 1); 305 string = ACPI_ALLOCATE_ZEROED(string_size + 1);
306 if (!string) { 306 if (!string) {
307 ACPI_ERROR((AE_INFO, "Could not allocate size %u", 307 ACPI_ERROR((AE_INFO, "Could not allocate size %u",
308 (u32) string_size)); 308 (u32)string_size));
309 acpi_ut_remove_reference(string_desc); 309 acpi_ut_remove_reference(string_desc);
310 return_PTR(NULL); 310 return_PTR(NULL);
311 } 311 }