[PATCH] [RESENT] Fix Oops in IPMI with acpi=off|ht : ipmi_si_intf-acpi-disabled

[Yann Droneaud <ydroneaud@mandriva.com>]

[The patch was dropped in 2.6.12-rc5-mm2 with bk-acpi although it
wasn't related to it.
This patch is rediffed against 2.6.12-rc6, please apply]

This patch fix ipmi_si_intf to not use ACPI tables if the ACPI
subsystem is disabled, removing a Oops in ACPI layer (which is really
fixed by a previous patch sent by me but not confirmed by ACPI team).

Regards

--- linux-2.6.12-rc6/drivers/char/ipmi/ipmi_si_intf.c	2005-06-07 16:40:11.970072000 +0200
+++ linux-2.6.12-rc6-meuh/drivers/char/ipmi/ipmi_si_intf.c	2005-06-07 16:43:05.797516580 +0200
@@ -1484,6 +1484,9 @@ static int try_init_acpi(int intf_num, s
 	char             *io_type;
 	u8 		 addr_space;
 
+	if (acpi_disabled)
+		return -ENODEV;
+
 	if (acpi_failure)
 		return -ENODEV;
 


-- 
Yann Droneaud <ydroneaud@mandriva.com>
Consulting Engineer
Professional Services
Mandriva http://mandriva.com/ (previously known as Mandrakesoft)