Revert "ACPI: EC: Do not clear boot_ec_is_ecdt in acpi_ec_add()"

This reverts commit 281e612b4b9587c0c72e30c49ec279587b20da0f 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@gmx.de>
Reported-by: Rafael J. Wysocki <rafael@kernel.org>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 29b8fa618a02a164bb682903cafc099bf989f962..35dd2f1fb0e617387c556dac691b994ac846f4a3 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1646,6 +1646,7 @@ static int acpi_ec_add(struct acpi_device *device)
 
                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
@@ -1665,12 +1666,9 @@ static int acpi_ec_add(struct acpi_device *device)
 
        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");