From patchwork Fri Oct 6 00:15:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Hung X-Patchwork-Id: 822134 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=fwts-devel-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3y7VXK2cmqz9sRm; Fri, 6 Oct 2017 11:15:28 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1e0GIX-0001SD-Sf; Fri, 06 Oct 2017 00:15:25 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1e0GIW-0001S2-Pd for fwts-devel@lists.ubuntu.com; Fri, 06 Oct 2017 00:15:24 +0000 Received: from d50-92-231-200.bchsia.telus.net ([50.92.231.200] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1e0GIW-0002a9-9S; Fri, 06 Oct 2017 00:15:24 +0000 From: Alex Hung To: fwts-devel@lists.ubuntu.com Subject: [PATCH] acpi: devices: deiniit acpica when tests are skipped Date: Thu, 5 Oct 2017 17:15:20 -0700 Message-Id: <20171006001520.8461-1-alex.hung@canonical.com> X-Mailer: git-send-email 2.11.0 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" deinit function in fwts_framework_ops is not called when init function returns FWTS_SKIP. This patch fixes fwts_acpica_deinit() is not called. Signed-off-by: Alex Hung Acked-by: Colin Ian King Acked-by: Ivan Hu --- src/acpi/devices/ac_adapter/ac.c | 1 + src/acpi/devices/battery/battery.c | 1 + src/acpi/devices/battery/smart_battery.c | 1 + src/acpi/devices/ec/ec.c | 1 + 4 files changed, 4 insertions(+) diff --git a/src/acpi/devices/ac_adapter/ac.c b/src/acpi/devices/ac_adapter/ac.c index e573c4ba..d0323f24 100644 --- a/src/acpi/devices/ac_adapter/ac.c +++ b/src/acpi/devices/ac_adapter/ac.c @@ -57,6 +57,7 @@ static int acpi_ac_init(fwts_framework *fw) if (!device) { fwts_log_error(fw, "ACPI AC device does not exist, skipping test"); + fwts_acpica_deinit(); return FWTS_SKIP; } else { ACPI_BUFFER buffer; diff --git a/src/acpi/devices/battery/battery.c b/src/acpi/devices/battery/battery.c index ec1322ad..f6922328 100644 --- a/src/acpi/devices/battery/battery.c +++ b/src/acpi/devices/battery/battery.c @@ -57,6 +57,7 @@ static int acpi_battery_init(fwts_framework *fw) if (!device) { fwts_log_error(fw, "ACPI Battery device does not exist, skipping test"); + fwts_acpica_deinit(); return FWTS_SKIP; } else { ACPI_BUFFER buffer; diff --git a/src/acpi/devices/battery/smart_battery.c b/src/acpi/devices/battery/smart_battery.c index 81ecd529..f16f0f44 100644 --- a/src/acpi/devices/battery/smart_battery.c +++ b/src/acpi/devices/battery/smart_battery.c @@ -57,6 +57,7 @@ static int smart_battery_init(fwts_framework *fw) if (!device) { fwts_log_error(fw, "Smart Battery device does not exist, skipping test"); + fwts_acpica_deinit(); return FWTS_SKIP; } else { ACPI_BUFFER buffer; diff --git a/src/acpi/devices/ec/ec.c b/src/acpi/devices/ec/ec.c index a7ff5ded..1ddcbfe5 100644 --- a/src/acpi/devices/ec/ec.c +++ b/src/acpi/devices/ec/ec.c @@ -57,6 +57,7 @@ static int acpi_ec_init(fwts_framework *fw) if (!device) { fwts_log_error(fw, "ACPI EC device does not exist, skipping test"); + fwts_acpica_deinit(); return FWTS_SKIP; } else { ACPI_BUFFER buffer;