diff options
| -rw-r--r-- | drivers/acpi/acpica/hwsleep.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c index 0ed85cac3231..615996a36bed 100644 --- a/drivers/acpi/acpica/hwsleep.c +++ b/drivers/acpi/acpica/hwsleep.c | |||
| @@ -95,18 +95,6 @@ acpi_status acpi_hw_legacy_sleep(u8 sleep_state, u8 flags) | |||
| 95 | return_ACPI_STATUS(status); | 95 | return_ACPI_STATUS(status); |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | if (sleep_state != ACPI_STATE_S5) { | ||
| 99 | /* | ||
| 100 | * Disable BM arbitration. This feature is contained within an | ||
| 101 | * optional register (PM2 Control), so ignore a BAD_ADDRESS | ||
| 102 | * exception. | ||
| 103 | */ | ||
| 104 | status = acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 1); | ||
| 105 | if (ACPI_FAILURE(status) && (status != AE_BAD_ADDRESS)) { | ||
| 106 | return_ACPI_STATUS(status); | ||
| 107 | } | ||
| 108 | } | ||
| 109 | |||
| 110 | /* | 98 | /* |
| 111 | * 1) Disable/Clear all GPEs | 99 | * 1) Disable/Clear all GPEs |
| 112 | * 2) Enable all wakeup GPEs | 100 | * 2) Enable all wakeup GPEs |
| @@ -364,16 +352,6 @@ acpi_status acpi_hw_legacy_wake(u8 sleep_state, u8 flags) | |||
| 364 | [ACPI_EVENT_POWER_BUTTON]. | 352 | [ACPI_EVENT_POWER_BUTTON]. |
| 365 | status_register_id, ACPI_CLEAR_STATUS); | 353 | status_register_id, ACPI_CLEAR_STATUS); |
| 366 | 354 | ||
| 367 | /* | ||
| 368 | * Enable BM arbitration. This feature is contained within an | ||
| 369 | * optional register (PM2 Control), so ignore a BAD_ADDRESS | ||
| 370 | * exception. | ||
| 371 | */ | ||
| 372 | status = acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 0); | ||
| 373 | if (ACPI_FAILURE(status) && (status != AE_BAD_ADDRESS)) { | ||
| 374 | return_ACPI_STATUS(status); | ||
| 375 | } | ||
| 376 | |||
| 377 | acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, ACPI_SST_WORKING); | 355 | acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, ACPI_SST_WORKING); |
| 378 | return_ACPI_STATUS(status); | 356 | return_ACPI_STATUS(status); |
| 379 | } | 357 | } |
