aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann Droneaud <ydroneaud@mandriva.com>2005-06-07 16:54:01 +0200
committerLen Brown <len.brown@intel.com>2005-08-31 16:36:24 -0400
commit4fbd1514173a80f9dc93e8ebbd6d4eb97cee123e (patch)
treea1bee534fe254106cec916642ae90ebf15cec201
parenta18ecf413ca9846becb760f7f990c2c62c15965e (diff)
[ACPI] check acpi_disabled in IPMI
Signed-off-by: Yann Droneaud <ydroneaud@mandriva.com> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/char/ipmi/ipmi_si_intf.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index c51b02d9dfd..adbec73b80a 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;