aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2009-03-24 16:49:38 -0600
committerLen Brown <len.brown@intel.com>2009-03-27 12:49:38 -0400
commit81d0273df20edff275e2eefe6b50436af3bdf9e8 (patch)
tree2f0b38dca7d50027639c8675bba7187cb490e452 /drivers
parente60cc7a6f02598fc23c68a656fe9c263d6531ca0 (diff)
downloadlinux-linaro-android-81d0273df20edff275e2eefe6b50436af3bdf9e8.tar.gz
ACPI: skip DMI power state check when ACPI disabled
This patch makes acpi_init() exit early when ACPI is disabled. This skips a DMI check that affects ACPI power management. The DMI check prints a notice that is misleading when ACPI is disabled. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/bus.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 2e90410a303..bdeed39c3d3 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -869,6 +869,10 @@ static int __init acpi_init(void)
}
} else
disable_acpi();
+
+ if (acpi_disabled)
+ return result;
+
/*
* If the laptop falls into the DMI check table, the power state check
* will be disabled in the course of device power transistion.