diff options
Diffstat (limited to 'drivers/acpi/acpica/evmisc.c')
-rw-r--r-- | drivers/acpi/acpica/evmisc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/acpi/acpica/evmisc.c b/drivers/acpi/acpica/evmisc.c index 1b111ef74903..a5687540e9a6 100644 --- a/drivers/acpi/acpica/evmisc.c +++ b/drivers/acpi/acpica/evmisc.c | |||
@@ -264,13 +264,6 @@ void acpi_ev_terminate(void) | |||
264 | 264 | ||
265 | status = acpi_ev_walk_gpe_list(acpi_hw_disable_gpe_block, NULL); | 265 | status = acpi_ev_walk_gpe_list(acpi_hw_disable_gpe_block, NULL); |
266 | 266 | ||
267 | /* Remove SCI handler */ | ||
268 | |||
269 | status = acpi_ev_remove_sci_handler(); | ||
270 | if (ACPI_FAILURE(status)) { | ||
271 | ACPI_ERROR((AE_INFO, "Could not remove SCI handler")); | ||
272 | } | ||
273 | |||
274 | status = acpi_ev_remove_global_lock_handler(); | 267 | status = acpi_ev_remove_global_lock_handler(); |
275 | if (ACPI_FAILURE(status)) { | 268 | if (ACPI_FAILURE(status)) { |
276 | ACPI_ERROR((AE_INFO, | 269 | ACPI_ERROR((AE_INFO, |
@@ -280,6 +273,13 @@ void acpi_ev_terminate(void) | |||
280 | acpi_gbl_events_initialized = FALSE; | 273 | acpi_gbl_events_initialized = FALSE; |
281 | } | 274 | } |
282 | 275 | ||
276 | /* Remove SCI handlers */ | ||
277 | |||
278 | status = acpi_ev_remove_all_sci_handlers(); | ||
279 | if (ACPI_FAILURE(status)) { | ||
280 | ACPI_ERROR((AE_INFO, "Could not remove SCI handler")); | ||
281 | } | ||
282 | |||
283 | /* Deallocate all handler objects installed within GPE info structs */ | 283 | /* Deallocate all handler objects installed within GPE info structs */ |
284 | 284 | ||
285 | status = acpi_ev_walk_gpe_list(acpi_ev_delete_gpe_handlers, NULL); | 285 | status = acpi_ev_walk_gpe_list(acpi_ev_delete_gpe_handlers, NULL); |