Skip to content

Commit

Permalink
ACPI: skip DMI power state check when ACPI disabled
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bjorn Helgaas authored and Len Brown committed Mar 27, 2009
1 parent e60cc7a commit 81d0273
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/acpi/bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 81d0273

Please sign in to comment.