aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/processor_idle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 66a9d8145562..ae0010821ce3 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -447,7 +447,7 @@ static void acpi_processor_idle(void)
447 447
448 pr->power.bm_activity <<= diff; 448 pr->power.bm_activity <<= diff;
449 449
450 acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status); 450 acpi_get_register_unlocked(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
451 if (bm_status) { 451 if (bm_status) {
452 pr->power.bm_activity |= 0x1; 452 pr->power.bm_activity |= 0x1;
453 acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, 1); 453 acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, 1);
@@ -1383,7 +1383,7 @@ static int acpi_idle_bm_check(void)
1383{ 1383{
1384 u32 bm_status = 0; 1384 u32 bm_status = 0;
1385 1385
1386 acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status); 1386 acpi_get_register_unlocked(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
1387 if (bm_status) 1387 if (bm_status)
1388 acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, 1); 1388 acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, 1);
1389 /* 1389 /*