diff options
| author | Bob Moore <robert.moore@intel.com> | 2015-12-29 13:57:07 +0800 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-01 03:47:36 +0100 |
| commit | 973da572820c1c85ae828c2e090e9f902546ba96 (patch) | |
| tree | 729af737ff9579a328a754cb7db8ce9add0456ad /drivers/acpi | |
| parent | 5e568304a2971332bb7b80fd6cf2a0f77e487d32 (diff) | |
| download | linux-973da572820c1c85ae828c2e090e9f902546ba96.tar.bz2 | |
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>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/acpica/exdebug.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/exdebug.c b/drivers/acpi/acpica/exdebug.c index a2033353d030..ca6e379f4347 100644 --- 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) && |