]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ACPI: skip DMI power state check when ACPI disabled
authorBjorn Helgaas <bjorn.helgaas@hp.com>
Tue, 24 Mar 2009 22:49:38 +0000 (16:49 -0600)
committerLen Brown <len.brown@intel.com>
Fri, 27 Mar 2009 16:49:38 +0000 (12:49 -0400)
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>
drivers/acpi/bus.c

index 2e90410a303507b1887b8b95613579b88f1949c2..bdeed39c3d38e4c867bba17f8be948c89487d7ca 100644 (file)
@@ -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.