diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 06:58:14 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 06:58:14 -0400 |
commit | 80338681bbc5786fa1342d3b7f021c1d8974ac62 (patch) | |
tree | 90cdacbab0695fcb8b0f5ad9f484e5a5f6751ecf /drivers/acpi/acpica/evmisc.c | |
parent | a204dbc61b7f4cb1a7e2cb3ad057b135164782da (diff) | |
parent | 069189a1c8e897be8c9d8f2365c30a6497100519 (diff) |
Merge branch 'acpica'
* acpica: (21 commits)
ACPICA: Update version to 20130517
ACPICA: _CST repair: Handle null package entries
ACPICA: Add several repairs for _CST predefined name
ACPICA: Move _PRT repair into the standard complex repair module
ACPICA: Clear events initialized flag upon event component termination
ACPICA: Fix possible memory leak in GPE init error path
ACPICA: ACPICA Termination: Delete global lock pending lock
ACPICA: Update interface to acpi_ut_valid_acpi_name()
ACPICA: Do not use extended sleep registers unless HW-reduced bit is set
ACPICA: Split table print utilities to a new a separate file
ACPICA: Add option to disable loading of SSDTs from the RSDT/XSDT
ACPICA: Standardize all switch() blocks
ACPICA: Split internal error msg routines to a separate file
ACPICA: Split buffer dump routines into separate file
ACPICA: Update version to 20130418
ACPICA: Update for "orphan" embedded controller _REG method support
ACPICA: Remove unused macros, no functional change
ACPICA: Predefined name support: Remove unused local variable
ACPICA: Add argument typechecking for all predefined ACPI names
ACPICA: Add BIOS error interface for predefined name validation support
...
Diffstat (limited to 'drivers/acpi/acpica/evmisc.c')
-rw-r--r-- | drivers/acpi/acpica/evmisc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/evmisc.c b/drivers/acpi/acpica/evmisc.c index c986b2336b81..1b111ef74903 100644 --- a/drivers/acpi/acpica/evmisc.c +++ b/drivers/acpi/acpica/evmisc.c | |||
@@ -78,6 +78,7 @@ u8 acpi_ev_is_notify_object(struct acpi_namespace_node *node) | |||
78 | return (TRUE); | 78 | return (TRUE); |
79 | 79 | ||
80 | default: | 80 | default: |
81 | |||
81 | return (FALSE); | 82 | return (FALSE); |
82 | } | 83 | } |
83 | } | 84 | } |
@@ -275,6 +276,8 @@ void acpi_ev_terminate(void) | |||
275 | ACPI_ERROR((AE_INFO, | 276 | ACPI_ERROR((AE_INFO, |
276 | "Could not remove Global Lock handler")); | 277 | "Could not remove Global Lock handler")); |
277 | } | 278 | } |
279 | |||
280 | acpi_gbl_events_initialized = FALSE; | ||
278 | } | 281 | } |
279 | 282 | ||
280 | /* Deallocate all handler objects installed within GPE info structs */ | 283 | /* Deallocate all handler objects installed within GPE info structs */ |