Author: jkim
Date: Fri Jan 23 18:12:44 2015
New Revision: 277579
URL: https://svnweb.freebsd.org/changeset/base/277579
Log:
Revert r216942. This commit was premature and caused too many complaints.
PR: 162859
MFC after: 3 days
Modified:
head/sys/dev/acpica/acpi_ec.c
Modified: head/sys/dev/acpica/acpi_ec.c
==============================================================================
--- head/sys/dev/acpica/acpi_ec.c Fri Jan 23 18:11:48 2015
(r277578)
+++ head/sys/dev/acpica/acpi_ec.c Fri Jan 23 18:12:44 2015
(r277579)
@@ -620,7 +620,7 @@ EcGpeQueryHandler(void *Context)
struct acpi_ec_softc *sc = (struct acpi_ec_softc *)Context;
UINT8 Data;
ACPI_STATUS Status;
- int retry, sci_enqueued;
+ int retry;
char qxx[5];
ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
@@ -641,7 +641,6 @@ EcGpeQueryHandler(void *Context)
* that may arise from running the query from causing another query
* to be queued, we clear the pending flag only after running it.
*/
- sci_enqueued = sc->ec_sci_pend;
for (retry = 0; retry < 2; retry++) {
Status = EcCommand(sc, EC_COMMAND_QUERY);
if (ACPI_SUCCESS(Status))
@@ -681,14 +680,6 @@ EcGpeQueryHandler(void *Context)
device_printf(sc->ec_dev, "evaluation of query method %s failed: %s\n",
qxx, AcpiFormatException(Status));
}
-
- /* Reenable runtime GPE if its execution was deferred. */
- if (sci_enqueued) {
- Status = AcpiFinishGpe(sc->ec_gpehandle, sc->ec_gpebit);
- if (ACPI_FAILURE(Status))
- device_printf(sc->ec_dev, "reenabling runtime GPE failed: %s\n",
- AcpiFormatException(Status));
- }
}
/*
@@ -722,10 +713,9 @@ EcGpeHandler(ACPI_HANDLE GpeDevice, UINT
if ((EcStatus & EC_EVENT_SCI) && !sc->ec_sci_pend) {
CTR0(KTR_ACPI, "ec gpe queueing query handler");
Status = AcpiOsExecute(OSL_GPE_HANDLER, EcGpeQueryHandler, Context);
- if (ACPI_SUCCESS(Status)) {
+ if (ACPI_SUCCESS(Status))
sc->ec_sci_pend = TRUE;
- return (0);
- } else
+ else
printf("EcGpeHandler: queuing GPE query handler failed\n");
}
return (ACPI_REENABLE_GPE);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
