Merge branch 'for-3.9-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / acpi / acpica / exdebug.c

diff --git a/drivers/acpi/acpica/exdebug.c b/drivers/acpi/acpica/exdebug.c
index bc5b9a6a131638ab8014228ea89ae95225955e3a..d7c9f51608a715cf9d2196ef165e1f717af91166 100644 (file)
--- a/drivers/acpi/acpica/exdebug.c
+++ b/drivers/acpi/acpica/exdebug.c
@@ -145,10 +145,10 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
        case ACPI_TYPE_BUFFER:
 
                acpi_os_printf("[0x%.2X]\n", (u32)source_desc->buffer.length);
-               acpi_ut_dump_buffer2(source_desc->buffer.pointer,
-                                    (source_desc->buffer.length < 256) ?
-                                    source_desc->buffer.length : 256,
-                                    DB_BYTE_DISPLAY);
+               acpi_ut_dump_buffer(source_desc->buffer.pointer,
+                                   (source_desc->buffer.length < 256) ?
+                                   source_desc->buffer.length : 256,
+                                   DB_BYTE_DISPLAY, 0);
                break;
 
        case ACPI_TYPE_STRING:
@@ -190,7 +190,7 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
 
                        acpi_os_printf("Table Index 0x%X\n",
                                       source_desc->reference.value);
-                       return;
+                       return_VOID;
 
                default:
                        break;