From: Greg Kroah-Hartman gregkh@linuxfoundation.org
This reverts commit ce7a61a0d57d2dd613941d8aef82a5b54fb2e396 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 --- drivers/acpi/ec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
--- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -1573,6 +1573,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 @@ -1592,12 +1593,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");