diff options
Diffstat (limited to 'drivers/acpi/events/evevent.c')
-rw-r--r-- | drivers/acpi/events/evevent.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/acpi/events/evevent.c b/drivers/acpi/events/evevent.c index 6b4bc99b1c2c..f09d1aa82edb 100644 --- a/drivers/acpi/events/evevent.c +++ b/drivers/acpi/events/evevent.c | |||
@@ -204,8 +204,7 @@ static acpi_status acpi_ev_fixed_event_initialize(void) | |||
204 | if (acpi_gbl_fixed_event_info[i].enable_register_id != 0xFF) { | 204 | if (acpi_gbl_fixed_event_info[i].enable_register_id != 0xFF) { |
205 | status = | 205 | status = |
206 | acpi_set_register(acpi_gbl_fixed_event_info[i]. | 206 | acpi_set_register(acpi_gbl_fixed_event_info[i]. |
207 | enable_register_id, 0, | 207 | enable_register_id, 0); |
208 | ACPI_MTX_LOCK); | ||
209 | if (ACPI_FAILURE(status)) { | 208 | if (ACPI_FAILURE(status)) { |
210 | return (status); | 209 | return (status); |
211 | } | 210 | } |
@@ -291,7 +290,7 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event) | |||
291 | /* Clear the status bit */ | 290 | /* Clear the status bit */ |
292 | 291 | ||
293 | (void)acpi_set_register(acpi_gbl_fixed_event_info[event]. | 292 | (void)acpi_set_register(acpi_gbl_fixed_event_info[event]. |
294 | status_register_id, 1, ACPI_MTX_DO_NOT_LOCK); | 293 | status_register_id, 1); |
295 | 294 | ||
296 | /* | 295 | /* |
297 | * Make sure we've got a handler. If not, report an error. | 296 | * Make sure we've got a handler. If not, report an error. |
@@ -299,8 +298,7 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event) | |||
299 | */ | 298 | */ |
300 | if (NULL == acpi_gbl_fixed_event_handlers[event].handler) { | 299 | if (NULL == acpi_gbl_fixed_event_handlers[event].handler) { |
301 | (void)acpi_set_register(acpi_gbl_fixed_event_info[event]. | 300 | (void)acpi_set_register(acpi_gbl_fixed_event_info[event]. |
302 | enable_register_id, 0, | 301 | enable_register_id, 0); |
303 | ACPI_MTX_DO_NOT_LOCK); | ||
304 | 302 | ||
305 | ACPI_ERROR((AE_INFO, | 303 | ACPI_ERROR((AE_INFO, |
306 | "No installed handler for fixed event [%08X]", | 304 | "No installed handler for fixed event [%08X]", |