Author: jkim
Date: Mon Jan 26 19:33:35 2015
New Revision: 277770
URL: https://svnweb.freebsd.org/changeset/base/277770
Log:
MFC: r277579
Revert r216942. This commit was premature and caused too many complaints.
Modified:
stable/9/sys/dev/acpica/acpi_ec.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/acpica/acpi_ec.c
==============================================================================
--- stable/9/sys/dev/acpica/acpi_ec.c Mon Jan 26 19:31:14 2015
(r277769)
+++ stable/9/sys/dev/acpica/acpi_ec.c Mon Jan 26 19:33:35 2015
(r277770)
@@ -623,7 +623,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__);
@@ -644,7 +644,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))
@@ -684,14 +683,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));
- }
}
/*
@@ -725,10 +716,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"
