From: Yann Droneaud <ydroneaud@mandriva.com>
Date: Tue, 7 Jun 2005 14:54:01 +0000 (+0200)
Subject: [ACPI] check acpi_disabled in IPMI
X-Git-Tag: v2.6.14-rc1~256^2~14^2~12
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fbd1514173a80f9dc93e8ebbd6d4eb97cee123e;p=linux-2.6

[ACPI] check acpi_disabled in IPMI

Signed-off-by: Yann Droneaud <ydroneaud@mandriva.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index c51b02d9df..adbec73b80 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/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;