From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
This reverts commit e8eab1acd6cdf142fb93c47201a1ae1f3dcbfc5f which is
commit 65a691f5f8f0bb63d6a82eec7b0ffd193d8d8a5f upstream.
Rafael writes:
It has not been marked for -stable or otherwise requested to be
included AFAICS. Also it depends on other mainline commits that
have not been included into 5.6.5.
Reported-by: Toralf Förster <toralf.foerster@xxxxxx>
Reported-by: Rafael J. Wysocki <rafael@xxxxxxxxxx>
Cc: Sasha Levin <sashal@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/acpi/ec.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1654,6 +1654,7 @@ static int acpi_ec_add(struct acpi_devic
if (boot_ec && ec->command_addr == boot_ec->command_addr &&
ec->data_addr == boot_ec->data_addr) {
+ boot_ec_is_ecdt = false;
/*
* Trust PNP0C09 namespace location rather than
* ECDT ID. But trust ECDT GPE rather than _GPE
@@ -1673,12 +1674,9 @@ static int acpi_ec_add(struct acpi_devic
if (ec == boot_ec)
acpi_handle_info(boot_ec->handle,
- "Boot %s EC initialization complete\n",
+ "Boot %s EC used to handle transactions and events\n",
boot_ec_is_ecdt ? "ECDT" : "DSDT");
- acpi_handle_info(ec->handle,
- "EC: Used to handle transactions and events\n");
-
device->driver_data = ec;
ret = !!request_region(ec->data_addr, 1, "EC data");
