浏览代码

ACPICA: Debug object: Fix output for a NULL object

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>
Bob Moore 9 年之前
父节点
当前提交
973da57282
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      drivers/acpi/acpica/exdebug.c

+ 2 - 1
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 */
 	/* 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)) {
 	    (source_desc->common.type == ACPI_TYPE_STRING)) {
 		if ((source_desc->string.length == 0) ||
 		if ((source_desc->string.length == 0) ||
 		    ((source_desc->string.length == 1) &&
 		    ((source_desc->string.length == 1) &&