[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 c51b02d9dfd0cf0f40519f3b9d788248348e702f..adbec73b80a65f9e733934c765806eed906bc08c 100644 (file)
--- 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;