Commit 81d0273d authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

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: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent e60cc7a6
......@@ -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.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment