Skip to content

Commit

Permalink
ACPICA: Debug object: Fix output for a NULL object
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bob Moore authored and Rafael J. Wysocki committed Jan 1, 2016
1 parent 5e56830 commit 973da57
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/acpi/acpica/exdebug.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) &&
Expand Down

0 comments on commit 973da57

Please sign in to comment.