From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 5 Oct 2020 17:13:46 +0000 (+0200)
Subject: ACPI: EC: PM: Drop ec_no_wakeup check from acpi_ec_dispatch_gpe()
X-Git-Tag: v5.9.5~181
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=658433100603c5f01dd50b1636e2c74891d100a8;p=thirdparty%2Fkernel%2Fstable.git

ACPI: EC: PM: Drop ec_no_wakeup check from acpi_ec_dispatch_gpe()

commit e0e9ce390d7bc6a705653d4a8aa4ea92c9a65e53 upstream.

It turns out that in some cases there are EC events to flush in
acpi_ec_dispatch_gpe() even though the ec_no_wakeup kernel parameter
is set and the EC GPE is disabled while sleeping, so drop the
ec_no_wakeup check that prevents those events from being processed
from acpi_ec_dispatch_gpe().

Reported-by: Todd Brandt <todd.e.brandt@linux.intel.com>
Cc: 5.4+ <stable@vger.kernel.org> # 5.4+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 548cdbf7cca16..e0cb1bcfffb29 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -2011,9 +2011,6 @@ bool acpi_ec_dispatch_gpe(void)
 	if (acpi_any_gpe_status_set(first_ec->gpe))
 		return true;
 
-	if (ec_no_wakeup)
-		return false;
-
 	/*
 	 * Dispatch the EC GPE in-band, but do not report wakeup in any case
 	 * to allow the caller to process events properly after that.