From patchwork Fri Oct 11 03:07:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Hung X-Patchwork-Id: 3020461 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 611B69F1E1 for ; Fri, 11 Oct 2013 03:07:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9D9FA2030D for ; Fri, 11 Oct 2013 03:07:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 262D02031C for ; Fri, 11 Oct 2013 03:07:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753384Ab3JKDH2 (ORCPT ); Thu, 10 Oct 2013 23:07:28 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:56026 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752264Ab3JKDHY (ORCPT ); Thu, 10 Oct 2013 23:07:24 -0400 Received: from [175.182.138.143] (helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1VUT4T-0004vp-JK; Fri, 11 Oct 2013 03:07:22 +0000 From: Alex Hung To: lenb@kernel.org, rjw@sisk.pl, lv.zheng@intel.com, robert.moore@intel.com, linux-acpi@vger.kernel.org Cc: Alex Hung Subject: [PATCH 2/2] ACPICA: remove AE_NOT_FOUND errors for non-existing _Sx objects in AML Date: Fri, 11 Oct 2013 11:07:11 +0800 Message-Id: <1381460831-26241-2-git-send-email-alex.hung@canonical.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1381460831-26241-1-git-send-email-alex.hung@canonical.com> References: <1381460831-26241-1-git-send-email-alex.hung@canonical.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP After 48ffb94f9e6f9b11c26884f26199e3d51bb22e54, AE_NOT_FOUND errors are shown in dmesg as below: ACPI Exception: AE_NOT_FOUND, While evaluating Sleep State [\_S1_] ACPI Exception: AE_NOT_FOUND, While evaluating Sleep State [\_S2_] However, neither _S1 nor _S2 are defined in AML and thus these are false errors. This patch restores the related control flow to it was before 48ffb94f9e6f9b11c26884f26199e3d51bb22e54. Signed-off-by: Alex Hung --- drivers/acpi/acpica/hwxface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c index a0488b4..7a137c0 100644 --- a/drivers/acpi/acpica/hwxface.c +++ b/drivers/acpi/acpica/hwxface.c @@ -499,7 +499,7 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 *sleep_type_a, u8 *sleep_type_b) ACPI_CAST_PTR(char, acpi_gbl_sleep_state_names[sleep_state]); status = acpi_ns_evaluate(info); if (ACPI_FAILURE(status)) { - goto cleanup; + goto cleanup2; } /* Must have a return object */ @@ -571,6 +571,7 @@ cleanup: info->relative_pathname)); } +cleanup2: ACPI_FREE(info); return_ACPI_STATUS(status); }