aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/acpi/hardware/hwsleep.c3
-rw-r--r--include/acpi/acpixf.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index 4d0c677fac19..c0577ca55358 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -398,7 +398,8 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
398 /* Wait until we enter sleep state */ 398 /* Wait until we enter sleep state */
399 399
400 do { 400 do {
401 status = acpi_get_register(ACPI_BITREG_WAKE_STATUS, &in_value); 401 status = acpi_get_register_unlocked(ACPI_BITREG_WAKE_STATUS,
402 &in_value);
402 if (ACPI_FAILURE(status)) { 403 if (ACPI_FAILURE(status)) {
403 return_ACPI_STATUS(status); 404 return_ACPI_STATUS(status);
404 } 405 }
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 3d7ab9e0c9fe..9512f0456ad1 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -314,6 +314,8 @@ acpi_resource_to_address64(struct acpi_resource *resource,
314 */ 314 */
315acpi_status acpi_get_register(u32 register_id, u32 * return_value); 315acpi_status acpi_get_register(u32 register_id, u32 * return_value);
316 316
317acpi_status acpi_get_register_unlocked(u32 register_id, u32 *return_value);
318
317acpi_status acpi_set_register(u32 register_id, u32 value); 319acpi_status acpi_set_register(u32 register_id, u32 value);
318 320
319acpi_status 321acpi_status