aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
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 2e90410a3035..bdeed39c3d38 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -869,6 +869,10 @@ static int __init acpi_init(void)
869 } 869 }
870 } else 870 } else
871 disable_acpi(); 871 disable_acpi();
872
873 if (acpi_disabled)
874 return result;
875
872 /* 876 /*
873 * If the laptop falls into the DMI check table, the power state check 877 * If the laptop falls into the DMI check table, the power state check
874 * will be disabled in the course of device power transistion. 878 * will be disabled in the course of device power transistion.