From 81ae656bb59367a46e6ad14979fc48985d34dbc5 Mon Sep 17 00:00:00 2001
From: Yann Droneaud <ydroneaud@mandriva.com>
Date: Tue, 7 Jun 2005 16:54:01 +0200
Subject: [PATCH] --- yaml --- r: 7839 b: refs/heads/master c:
 4fbd1514173a80f9dc93e8ebbd6d4eb97cee123e h: refs/heads/master i:   7837:
 686cc53171a73abe05c6f81aecc898df60f7868c   7835:
 5cd0d52ce1e9fba0aa495ae5f49a79010d053096   7831:
 554dc87440e136fa1f084407aefabad2050ade62   7823:
 74646a2d2f17ac4d46d4b0e033f37c52913697ab   7807:
 362c2ea99f07bd93336917817fadfd4bdb4e3f6c v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/char/ipmi/ipmi_si_intf.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 795690bbf3cb..5a0a230b7bcd 100644
--- 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
index c51b02d9dfd0..adbec73b80a6 100644
--- 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;