---

yaml --- r: 7839 b: refs/heads/master c: 4fbd151 h: refs/heads/master i: 7837: 686cc53 7835: 5cd0d52 7831: 554dc87 7823: 74646a2 7807: 362c2ea v: v3
git-mirror · Aug 31, 2005 · 81ae656 · 81ae656
1 parent a943aa9
commit 81ae656
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a18ecf413ca9846becb760f7f990c2c62c15965e
+refs/heads/master: 4fbd1514173a80f9dc93e8ebbd6d4eb97cee123e
diff --git a/trunk/drivers/char/ipmi/ipmi_si_intf.c b/trunk/drivers/char/ipmi/ipmi_si_intf.c
@@ -1484,6 +1484,9 @@ static int try_init_acpi(int intf_num, struct smi_info **new_info)
 	char             *io_type;
 	u8 		 addr_space;
 
+	if (acpi_disabled)
+		return -ENODEV;
+
 	if (acpi_failure)
 		return -ENODEV;