From 6d3dae38d3fc38d9aeb2a5548fb060e3924afe4f Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Tue, 24 Mar 2009 16:49:38 -0600
Subject: [PATCH] --- yaml --- r: 141875 b: refs/heads/master c:
 81d0273df20edff275e2eefe6b50436af3bdf9e8 h: refs/heads/master i:   141873:
 00e83480dc611712c35c8c8bb445ffc152bff84b   141871:
 3f64fb067beea44ab6ad10e13dd7e08e4c2b2337 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/acpi/bus.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ecb7d3f5b0a7..53ac119ec6a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e60cc7a6f02598fc23c68a656fe9c263d6531ca0
+refs/heads/master: 81d0273df20edff275e2eefe6b50436af3bdf9e8
diff --git a/trunk/drivers/acpi/bus.c b/trunk/drivers/acpi/bus.c
index 2e90410a3035..bdeed39c3d38 100644
--- a/trunk/drivers/acpi/bus.c
+++ b/trunk/drivers/acpi/bus.c
@@ -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.