projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5e56830)
ACPICA: Debug object: Fix output for a NULL object
authorBob Moore <robert.moore@intel.com>
Tue, 29 Dec 2015 05:57:07 +0000 (13:57 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 1 Jan 2016 02:47:36 +0000 (03:47 +0100)
ACPICA commit e4414f067c726ef746dac990c0bae7f433045843

Was broken by addition of "null string" feature to emit
simple blank lines.

Link: https://github.com/acpica/acpica/commit/e4414f06
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/acpica/exdebug.c patch | blob | blame | history

diff --git a/drivers/acpi/acpica/exdebug.c b/drivers/acpi/acpica/exdebug.c
index a2033353d0307b32d08ccba3acd6248dacf7b609..ca6e379f4347af287ad76ecd805bdffb7fe6f2be 100644 (file)
--- a/drivers/acpi/acpica/exdebug.c
+++ b/drivers/acpi/acpica/exdebug.c
@@ -90,7 +90,8 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
 
        /* Null string or newline -- don't emit the line header */
 
-       if ((ACPI_GET_DESCRIPTOR_TYPE(source_desc) == ACPI_DESC_TYPE_OPERAND) &&
+       if (source_desc &&
+           (ACPI_GET_DESCRIPTOR_TYPE(source_desc) == ACPI_DESC_TYPE_OPERAND) &&
            (source_desc->common.type == ACPI_TYPE_STRING)) {
                if ((source_desc->string.length == 0) ||
                    ((source_desc->string.length == 1) &&