---

yaml --- r: 141875 b: refs/heads/master c: 81d0273 h: refs/heads/master i: 141873: 00e8348 141871: 3f64fb0 v: v3
git-mirror · Mar 27, 2009 · 6d3dae3 · 6d3dae3
1 parent 1eae44a
commit 6d3dae3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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.