Linux ACPI
 help / color / mirror / Atom feed
From: Hanjun Guo <guohanjun@huawei.com>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: James Morse <james.morse@arm.com>,
	Tony Luck <tony.luck@intel.com>, Borislav Petkov <bp@alien8.de>,
	<linux-acpi@vger.kernel.org>, Hanjun Guo <guohanjun@huawei.com>
Subject: [PATCH 7/9] ACPI: EC: Put the ACPI table after using it
Date: Thu, 7 May 2020 17:09:19 +0800	[thread overview]
Message-ID: <1588842561-32907-8-git-send-email-guohanjun@huawei.com> (raw)
In-Reply-To: <1588842561-32907-1-git-send-email-guohanjun@huawei.com>

The embedded controller boot resources table needs to be
released after using it.

Signed-off-by: Hanjun Guo <guohanjun@huawei.com>
---
 drivers/acpi/ec.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index b4c0152e..281a9bf 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1784,12 +1784,15 @@ static void __init acpi_ec_ecdt_start(void)
 
 	status = acpi_get_handle(NULL, ecdt_ptr->id, &handle);
 	if (ACPI_FAILURE(status))
-		return;
+		goto out;
 
 	boot_ec->handle = handle;
 
 	/* Add a special ACPI device object to represent the boot EC. */
 	acpi_bus_register_early_device(ACPI_BUS_TYPE_ECDT_EC);
+
+out:
+	acpi_put_table((struct acpi_table_header *)ecdt_ptr);
 }
 
 /*
@@ -1891,12 +1894,12 @@ void __init acpi_ec_ecdt_probe(void)
 		 * Asus X50GL:
 		 * https://bugzilla.kernel.org/show_bug.cgi?id=11880
 		 */
-		return;
+		goto out;
 	}
 
 	ec = acpi_ec_alloc();
 	if (!ec)
-		return;
+		goto out;
 
 	if (EC_FLAGS_CORRECT_ECDT) {
 		ec->command_addr = ecdt_ptr->data.address;
@@ -1922,13 +1925,16 @@ void __init acpi_ec_ecdt_probe(void)
 	ret = acpi_ec_setup(ec, NULL);
 	if (ret) {
 		acpi_ec_free(ec);
-		return;
+		goto out;
 	}
 
 	boot_ec = ec;
 	boot_ec_is_ecdt = true;
 
 	pr_info("Boot ECDT EC used to handle transactions\n");
+
+out:
+	acpi_put_table((struct acpi_table_header *)ecdt_ptr);
 }
 
 #ifdef CONFIG_PM_SLEEP
-- 
1.7.12.4


  parent reply	other threads:[~2020-05-07  9:16 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-07  9:09 [PATCH 0/9] ACPI: Call acpi_put_table() to release the ACPI table mappings Hanjun Guo
2020-05-07  9:09 ` [PATCH 1/9] ACPI: LPIT: Put the low power idle table after using it Hanjun Guo
2020-05-07  9:09 ` [PATCH 2/9] ACPI: watchdog: Put the watchdog action table after parsing Hanjun Guo
2020-05-07  9:09 ` [PATCH 3/9] ACPI: APEI: Put the boot error record " Hanjun Guo
2020-05-07  9:09 ` [PATCH 4/9] ACPI: APEI: Put the error injection table for error path and module exit Hanjun Guo
2020-05-07  9:09 ` [PATCH 5/9] ACPI: APEI: Put the error record serialization table for error path Hanjun Guo
2020-05-07  9:09 ` [PATCH 6/9] ACPI: APEI: Put the HEST " Hanjun Guo
2020-05-07  9:09 ` Hanjun Guo [this message]
2020-05-09  9:11   ` [PATCH 7/9] ACPI: EC: Put the ACPI table after using it Rafael J. Wysocki
2020-05-09  9:30     ` Rafael J. Wysocki
2020-05-09  9:47       ` Hanjun Guo
2020-05-07  9:09 ` [PATCH 8/9] ACPI: scan: Put SPCR and STAO " Hanjun Guo
2020-05-07  9:09 ` [PATCH 9/9] ACPI: sleep: Put the FACS " Hanjun Guo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1588842561-32907-8-git-send-email-guohanjun@huawei.com \
    --to=guohanjun@huawei.com \
    --cc=bp@alien8.de \
    --cc=james.morse@arm.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=rjw@rjwysocki.net \
    --cc=tony.luck@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox