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>
This commit is contained in:
Bjorn Helgaas 2009-03-24 16:49:38 -06:00 committed by Len Brown
parent e60cc7a6f0
commit 81d0273df2
1 changed files with 4 additions and 0 deletions

View File

@ -869,6 +869,10 @@ static int __init acpi_init(void)
} }
} else } else
disable_acpi(); disable_acpi();
if (acpi_disabled)
return result;
/* /*
* If the laptop falls into the DMI check table, the power state check * If the laptop falls into the DMI check table, the power state check
* will be disabled in the course of device power transistion. * will be disabled in the course of device power transistion.