mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-21 01:51:18 +00:00
Revert "ACPI: EC: Do not clear boot_ec_is_ecdt in acpi_ec_add()"
This reverts commitce7a61a0d5
which is commit65a691f5f8
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>
This commit is contained in:
parent
4f2fb2a199
commit
c85a7109f9
1 changed files with 2 additions and 4 deletions
|
@ -1573,6 +1573,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
|
||||
|
@ -1592,12 +1593,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");
|
||||
|
|
Loading…
Reference in a new issue