From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753547AbbL2F5P (ORCPT ); Tue, 29 Dec 2015 00:57:15 -0500 Received: from mga14.intel.com ([192.55.52.115]:29608 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753330AbbL2F5L (ORCPT ); Tue, 29 Dec 2015 00:57:11 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,493,1444719600"; d="scan'208";a="625070476" From: Lv Zheng To: "Rafael J. Wysocki" , Len Brown Cc: Lv Zheng , Lv Zheng , , linux-acpi@vger.kernel.org, Bob Moore Subject: [PATCH 19/42] ACPICA: Debug object: Fix output for a NULL object Date: Tue, 29 Dec 2015 13:57:07 +0800 Message-Id: <0a73d63d6a9914f343e933d54cca6ed90b3dca03.1451367389.git.lv.zheng@intel.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bob Moore 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 Signed-off-by: Lv Zheng --- drivers/acpi/acpica/exdebug.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/acpica/exdebug.c b/drivers/acpi/acpica/exdebug.c index a203335..ca6e379 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) && -- 1.7.10