diff options
| author | jkim <jkim@FreeBSD.org> | 2012-05-24 23:12:30 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2012-05-24 23:12:30 +0000 |
| commit | 5e29a3bfbb9c8830043811a67749c68d62419dcb (patch) | |
| tree | 9dd2174199f7139519d2253a1b845832de100537 /sys/contrib/dev/acpica/components/events | |
| parent | 9efa72fd429a41fc46f151a4d5f03c1198c2a4da (diff) | |
| download | FreeBSD-src-5e29a3bfbb9c8830043811a67749c68d62419dcb.zip FreeBSD-src-5e29a3bfbb9c8830043811a67749c68d62419dcb.tar.gz | |
Merge ACPICA 20120518.
Diffstat (limited to 'sys/contrib/dev/acpica/components/events')
| -rw-r--r-- | sys/contrib/dev/acpica/components/events/evxface.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/contrib/dev/acpica/components/events/evxface.c b/sys/contrib/dev/acpica/components/events/evxface.c index 5634ad7..4027dce 100644 --- a/sys/contrib/dev/acpica/components/events/evxface.c +++ b/sys/contrib/dev/acpica/components/events/evxface.c @@ -280,11 +280,9 @@ AcpiRemoveNotifyHandler ( return_ACPI_STATUS (AE_BAD_PARAMETER); } -#ifdef _UNDER_DEVELOPMENT - /* Make sure all deferred tasks are completed */ + /* Make sure all deferred notify tasks are completed */ - AcpiOsWaitEventsComplete (NULL); -#endif + AcpiOsWaitEventsComplete (); Status = AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE); if (ACPI_FAILURE (Status)) @@ -802,6 +800,10 @@ AcpiRemoveGpeHandler ( return_ACPI_STATUS (AE_BAD_PARAMETER); } + /* Make sure all deferred GPE tasks are completed */ + + AcpiOsWaitEventsComplete (); + Status = AcpiUtAcquireMutex (ACPI_MTX_EVENTS); if (ACPI_FAILURE (Status)) { |
